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

Merge branch 'group_action_playlist_builder' into devel

This commit is contained in:
Yuchen Wang 2012-01-12 14:28:12 -05:00
parent 4a372715a3 186aa9e898
commit 6b7523513e
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -341,15 +341,15 @@ class ScheduleController extends Zend_Controller_Action
return false; return false;
} }
$playlists = $show->searchPlaylistsForShow($post); $playlists = $show->searchPlaylistsForShow($post);
foreach( $playlists['aaData'] as &$data){ foreach( $playlists['aaData'] as &$data){
// calling two functions to format time to 1 decimal place // calling two functions to format time to 1 decimal place
$sec = Application_Model_Playlist::playlistTimeToSeconds($data[4]); $sec = Application_Model_Playlist::playlistTimeToSeconds($data['length']);
$data[4] = Application_Model_Playlist::secondsToPlaylistTime($sec); $data['length'] = Application_Model_Playlist::secondsToPlaylistTime($sec);
} }
//for datatables //for datatables
die(json_encode($playlists)); die(json_encode($playlists));
} }
public function removeGroupAction() public function removeGroupAction()

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

@ -86,7 +86,7 @@ function setScheduleDialogEvents(dialog) {
} }
function dtRowCallback( nRow, aData, iDisplayIndex, iDisplayIndexFull ) { function dtRowCallback( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {
var id = "pl_" + aData[0]; var id = "pl_" + aData['id'];
$(nRow).attr("id", id); $(nRow).attr("id", id);
@ -125,12 +125,12 @@ function makeScheduleDialog(dialog, json) {
"fnRowCallback": dtRowCallback, "fnRowCallback": dtRowCallback,
"fnDrawCallback": dtDrawCallback, "fnDrawCallback": dtDrawCallback,
"aoColumns": [ "aoColumns": [
/* Id */ { "sName": "pl.id", "bSearchable": false, "bVisible": false }, /* Id */ {"sTitle": "ID", "sName": "pl.id", "bSearchable": false, "bVisible": false, "mDataProp": "id"},
/* Description */ { "sName": "pl.description", "bVisible": false }, /* Description */ {"sTitle": "Description", "sName": "pl.description", "bSearchable": false, "bVisible": false, "mDataProp": "description"},
/* Name */ { "sName": "pl.name" }, /* Name */ {"sTitle": "Title", "sName": "pl.name", "mDataProp": "name"},
/* Creator */ { "sName": "pl.creator" }, /* Creator */ {"sTitle": "Creator", "sName": "pl.creator", "mDataProp": "creator"},
/* Length */ { "sName": "plt.length" }, /* Length */ {"sTitle": "Length", "sName": "plt.length", "mDataProp": "length"},
/* Editing */ { "sName": "sub.login" } /* Editing */ {"sTitle": "Editing", "sName": "sub.login", "mDataProp": "login"}
], ],
"aaSorting": [[2,'asc']], "aaSorting": [[2,'asc']],
"sPaginationType": "full_numbers", "sPaginationType": "full_numbers",