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

CC-3226: Record cancel dialog says "stop playback?" instead of "stop recording?" 

Done
This commit is contained in:
Yuchen Wang 2012-01-13 16:46:37 -05:00
parent 9629e2bbae
commit d753b0bb02
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
airtime_mvc/application/controllers/ScheduleController.php
View File

@ -235,9 +235,15 @@ class ScheduleController extends Zend_Controller_Action
if ($showStartDateHelper->getTimestamp() <= $epochNow && if ($showStartDateHelper->getTimestamp() <= $epochNow &&
$epochNow < $showEndDateHelper->getTimestamp() && $epochNow < $showEndDateHelper->getTimestamp() &&
$user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER))) { $user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER))) {
if ($show->isRecorded()) {
$menu[] = array('action' => array('type' => 'fn',
'callback' => "window['confirmCancelRecordedShow']($id)"),
'title' => 'Cancel Current Show');
} else {
$menu[] = array('action' => array('type' => 'fn', $menu[] = array('action' => array('type' => 'fn',
'callback' => "window['confirmCancelShow']($id)"), 'callback' => "window['confirmCancelShow']($id)"),
'title' => 'Cancel Current Show'); 'title' => 'Cancel Current Show');
}
} }
if ($epochNow < $showStartDateHelper->getTimestamp()) { if ($epochNow < $showStartDateHelper->getTimestamp()) {

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

@ -184,6 +184,16 @@ function confirmCancelShow(show_instance_id){
} }
} }
function confirmCancelRecordedShow(show_instance_id){
if(confirm('Erase current show and stop recording?')){
var url = "/Schedule/cancel-current-show/id/"+show_instance_id;
$.ajax({
url: url,
success: function(data){scheduleRefetchEvents(data);}
});
}
}
function uploadToSoundCloud(show_instance_id){ function uploadToSoundCloud(show_instance_id){
var url = "/Schedule/upload-to-sound-cloud"; var url = "/Schedule/upload-to-sound-cloud";