From 6a2bab66fa0d2936543fab2733a6e0bcf7889c7f Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Tue, 15 May 2012 13:02:24 +0200 Subject: [PATCH 1/4] CC-3825 : Deleting any recorded show cancels the current recording show --- airtime_mvc/application/models/RabbitMq.php | 2 +- airtime_mvc/application/models/ShowInstance.php | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/airtime_mvc/application/models/RabbitMq.php b/airtime_mvc/application/models/RabbitMq.php index a01d5c9a9..4e00da379 100644 --- a/airtime_mvc/application/models/RabbitMq.php +++ b/airtime_mvc/application/models/RabbitMq.php @@ -82,7 +82,7 @@ class Application_Model_RabbitMq $temp['event_type'] = $event_type; $temp['server_timezone'] = Application_Model_Preference::GetTimezone(); - if($event_type = "update_recorder_schedule"){ + if($event_type == "update_recorder_schedule"){ $temp['shows'] = Application_Model_Show::getShows($now, $end_timestamp, $excludeInstance=NULL, $onlyRecord=TRUE); } $data = json_encode($temp); diff --git a/airtime_mvc/application/models/ShowInstance.php b/airtime_mvc/application/models/ShowInstance.php index 024a4faa5..f1dd07cd3 100644 --- a/airtime_mvc/application/models/ShowInstance.php +++ b/airtime_mvc/application/models/ShowInstance.php @@ -543,9 +543,6 @@ class Application_Model_ShowInstance { } Application_Model_RabbitMq::PushSchedule(); - if($recording){ - Application_Model_RabbitMq::SendMessageToShowRecorder("cancel_recording"); - } } public function setRecordedFile($file_id) From 07d029b8ccdc8e89677800b49689e1b1a8928e96 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Tue, 15 May 2012 14:56:31 +0200 Subject: [PATCH 2/4] 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)) { From d2dc02cf9e8ebfb76a29ed83022c4a92a842c8d2 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Tue, 15 May 2012 15:07:42 +0200 Subject: [PATCH 3/4] CC-3777 : Decide on what should happen with canceling recorded show --- airtime_mvc/application/models/Scheduler.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/airtime_mvc/application/models/Scheduler.php b/airtime_mvc/application/models/Scheduler.php index f7c20fcfe..3e7a39aa7 100644 --- a/airtime_mvc/application/models/Scheduler.php +++ b/airtime_mvc/application/models/Scheduler.php @@ -652,6 +652,10 @@ class Application_Model_Scheduler { $this->removeItems($remove, false); } + } + else { + $rebroadcasts = $instance->getCcShowInstancessRelatedByDbId(null, $this->con); + $rebroadcasts->delete($this->con); } $instance->setDbEnds($this->nowDT); From c4c988b98a818f01970d87991588f26564e6f180 Mon Sep 17 00:00:00 2001 From: denise Date: Tue, 15 May 2012 11:54:11 -0400 Subject: [PATCH 4/4] CC-3797: Feedback Metrics "Show Me What I Am Sending" doesnt show all of the fields that are being sent -now shows all keys, null or not, in the list --- airtime_mvc/application/models/Preference.php | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php index a8af84410..2505a563f 100644 --- a/airtime_mvc/application/models/Preference.php +++ b/airtime_mvc/application/models/Preference.php @@ -465,26 +465,24 @@ class Application_Model_Preference $outputString = "\n"; foreach($outputArray as $key => $out){ - if($key == 'SAAS' && ($out != '' || $out != 'disabled')){ + if($key == 'TRIAL_END_DATE' && ($out != '' || $out != 'NULL')){ continue; } - if($out != '' || is_numeric($out)){ - if($key == "STREAM_INFO"){ - $outputString .= $key." :\n"; - foreach($out as $s_info){ - foreach($s_info as $k => $v){ - $outputString .= "\t".strtoupper($k)." : ".$v."\n"; - } + if($key == "STREAM_INFO"){ + $outputString .= $key." :\n"; + foreach($out as $s_info){ + foreach($s_info as $k => $v){ + $outputString .= "\t".strtoupper($k)." : ".$v."\n"; } - }else if ($key == "SOUNDCLOUD_ENABLED") { - if ($out) { - $outputString .= $key." : TRUE\n"; - } else if (!$out) { - $outputString .= $key." : FALSE\n"; - } - }else{ - $outputString .= $key.' : '.$out."\n"; } + }else if ($key == "SOUNDCLOUD_ENABLED") { + if ($out) { + $outputString .= $key." : TRUE\n"; + } else if (!$out) { + $outputString .= $key." : FALSE\n"; + } + }else{ + $outputString .= $key.' : '.$out."\n"; } } if($returnArray){