From 07d029b8ccdc8e89677800b49689e1b1a8928e96 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Tue, 15 May 2012 14:56:31 +0200
Subject: [PATCH] CC-3777 : Decide on what should happen with canceling
 recorded show

---
 airtime_mvc/application/models/Scheduler.php        | 13 +++++--------
 airtime_mvc/public/js/airtime/schedule/schedule.js  |  2 +-
 .../public/js/airtime/showbuilder/builder.js        |  2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/airtime_mvc/application/models/Scheduler.php b/airtime_mvc/application/models/Scheduler.php
index 744d65c9e..f7c20fcfe 100644
--- a/airtime_mvc/application/models/Scheduler.php
+++ b/airtime_mvc/application/models/Scheduler.php
@@ -651,15 +651,12 @@ class Application_Model_Scheduler {
                     }
                     
                     $this->removeItems($remove, false);
-                }
+                }
+            }
                 
-                $instance->setDbEnds($this->nowDT);
-                $instance->save($this->con);
-            }
-            else {
-                $instance->delete($this->con);
-            }
-               
+            $instance->setDbEnds($this->nowDT);
+            $instance->save($this->con);
+   
             $this->con->commit();
             
             if ($instance->getDbRecord()) {
diff --git a/airtime_mvc/public/js/airtime/schedule/schedule.js b/airtime_mvc/public/js/airtime/schedule/schedule.js
index c3c1e1c26..80ef628c1 100644
--- a/airtime_mvc/public/js/airtime/schedule/schedule.js
+++ b/airtime_mvc/public/js/airtime/schedule/schedule.js
@@ -46,7 +46,7 @@ function confirmCancelShow(show_instance_id){
 }
 
 function confirmCancelRecordedShow(show_instance_id){
-    if (confirm('Erase current show and stop recording?')) {
+    if (confirm('Stop recording current show?')) {
         var url = "/Schedule/cancel-current-show";
         $.ajax({
 	        url: url,
diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js
index 242121d80..22364c915 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js
@@ -849,7 +849,7 @@ var AIRTIME = (function(AIRTIME){
 					data = $tr.data("aData");
 					
 					if (data.record === true) {
-						msg = 'Erase current show and stop recording?';
+						msg = 'Stop recording current show?';
 					}
 					
 					if (confirm(msg)) {