Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
Martin Konecny 2012-05-15 12:35:15 -04:00
parent 025ef0ed27 c4c988b98a
commit 55b0715142
6 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtime_mvc/application/models/Preference.php
View File

@ -465,10 +465,9 @@ class Application_Model_Preference
$outputString = "\n"; $outputString = "\n";
foreach($outputArray as $key => $out){ foreach($outputArray as $key => $out){
if($key == 'SAAS' && ($out != '' || $out != 'disabled')){ if($key == 'TRIAL_END_DATE' && ($out != '' || $out != 'NULL')){
continue; continue;
} }
if($out != '' || is_numeric($out)){
if($key == "STREAM_INFO"){ if($key == "STREAM_INFO"){
$outputString .= $key." :\n"; $outputString .= $key." :\n";
foreach($out as $s_info){ foreach($out as $s_info){
@ -486,7 +485,6 @@ class Application_Model_Preference
$outputString .= $key.' : '.$out."\n"; $outputString .= $key.' : '.$out."\n";
} }
} }
}
if($returnArray){ if($returnArray){
$outputArray['PROMOTE'] = self::GetPublicise(); $outputArray['PROMOTE'] = self::GetPublicise();
$outputArray['LOGOIMG'] = self::GetStationLogo(); $outputArray['LOGOIMG'] = self::GetStationLogo();

2
airtime_mvc/application/models/RabbitMq.php
View File

@ -82,7 +82,7 @@ class Application_Model_RabbitMq
$temp['event_type'] = $event_type; $temp['event_type'] = $event_type;
$temp['server_timezone'] = Application_Model_Preference::GetTimezone(); $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); $temp['shows'] = Application_Model_Show::getShows($now, $end_timestamp, $excludeInstance=NULL, $onlyRecord=TRUE);
} }
$data = json_encode($temp); $data = json_encode($temp);

9
airtime_mvc/application/models/Scheduler.php
View File

@ -652,13 +652,14 @@ class Application_Model_Scheduler {
$this->removeItems($remove, false); $this->removeItems($remove, false);
} }
}
else {
$rebroadcasts = $instance->getCcShowInstancessRelatedByDbId(null, $this->con);
$rebroadcasts->delete($this->con);
}
$instance->setDbEnds($this->nowDT); $instance->setDbEnds($this->nowDT);
$instance->save($this->con); $instance->save($this->con);
}
else {
$instance->delete($this->con);
}
$this->con->commit(); $this->con->commit();

3
airtime_mvc/application/models/ShowInstance.php
View File

@ -543,9 +543,6 @@ class Application_Model_ShowInstance {
} }
Application_Model_RabbitMq::PushSchedule(); Application_Model_RabbitMq::PushSchedule();
if($recording){
Application_Model_RabbitMq::SendMessageToShowRecorder("cancel_recording");
}
} }
public function setRecordedFile($file_id) public function setRecordedFile($file_id)

2
airtime_mvc/public/js/airtime/schedule/schedule.js
View File

@ -46,7 +46,7 @@ function confirmCancelShow(show_instance_id){
} }
function confirmCancelRecordedShow(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"; var url = "/Schedule/cancel-current-show";
$.ajax({ $.ajax({
url: url, url: url,

2
airtime_mvc/public/js/airtime/showbuilder/builder.js
View File

@ -849,7 +849,7 @@ var AIRTIME = (function(AIRTIME){
data = $tr.data("aData"); data = $tr.data("aData");
if (data.record === true) { if (data.record === true) {
msg = 'Erase current show and stop recording?'; msg = 'Stop recording current show?';
} }
if (confirm(msg)) { if (confirm(msg)) {