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

CC-3777 : Decide on what should happen with canceling recorded show

Browse source
This commit is contained in:
Naomi Aro 2012-05-15 14:56:31 +02:00
parent 6a2bab66fa
commit 07d029b8cc
3 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
airtime_mvc/application/models/Scheduler.php
View file

@ -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()) {

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){
if (confirm('Erase current show and stop recording?')) {
if (confirm('Stop recording current show?')) {
var url = "/Schedule/cancel-current-show";
$.ajax({
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");
if (data.record === true) {
msg = 'Erase current show and stop recording?';
msg = 'Stop recording current show?';
}
if (confirm(msg)) {