diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php index 21ec7b96c..0df70a6b4 100644 --- a/airtime_mvc/application/controllers/ScheduleController.php +++ b/airtime_mvc/application/controllers/ScheduleController.php @@ -341,15 +341,15 @@ class ScheduleController extends Zend_Controller_Action return false; } - $playlists = $show->searchPlaylistsForShow($post); - foreach( $playlists['aaData'] as &$data){ - // calling two functions to format time to 1 decimal place - $sec = Application_Model_Playlist::playlistTimeToSeconds($data[4]); - $data[4] = Application_Model_Playlist::secondsToPlaylistTime($sec); - } + $playlists = $show->searchPlaylistsForShow($post); + foreach( $playlists['aaData'] as &$data){ + // calling two functions to format time to 1 decimal place + $sec = Application_Model_Playlist::playlistTimeToSeconds($data['length']); + $data['length'] = Application_Model_Playlist::secondsToPlaylistTime($sec); + } - //for datatables - die(json_encode($playlists)); + //for datatables + die(json_encode($playlists)); } public function removeGroupAction() diff --git a/airtime_mvc/public/js/airtime/schedule/schedule.js b/airtime_mvc/public/js/airtime/schedule/schedule.js index c1e3c1be1..f32a11dc4 100644 --- a/airtime_mvc/public/js/airtime/schedule/schedule.js +++ b/airtime_mvc/public/js/airtime/schedule/schedule.js @@ -86,7 +86,7 @@ function setScheduleDialogEvents(dialog) { } function dtRowCallback( nRow, aData, iDisplayIndex, iDisplayIndexFull ) { - var id = "pl_" + aData[0]; + var id = "pl_" + aData['id']; $(nRow).attr("id", id); @@ -125,12 +125,12 @@ function makeScheduleDialog(dialog, json) { "fnRowCallback": dtRowCallback, "fnDrawCallback": dtDrawCallback, "aoColumns": [ - /* Id */ { "sName": "pl.id", "bSearchable": false, "bVisible": false }, - /* Description */ { "sName": "pl.description", "bVisible": false }, - /* Name */ { "sName": "pl.name" }, - /* Creator */ { "sName": "pl.creator" }, - /* Length */ { "sName": "plt.length" }, - /* Editing */ { "sName": "sub.login" } + /* Id */ {"sTitle": "ID", "sName": "pl.id", "bSearchable": false, "bVisible": false, "mDataProp": "id"}, + /* Description */ {"sTitle": "Description", "sName": "pl.description", "bSearchable": false, "bVisible": false, "mDataProp": "description"}, + /* Name */ {"sTitle": "Title", "sName": "pl.name", "mDataProp": "name"}, + /* Creator */ {"sTitle": "Creator", "sName": "pl.creator", "mDataProp": "creator"}, + /* Length */ {"sTitle": "Length", "sName": "plt.length", "mDataProp": "length"}, + /* Editing */ {"sTitle": "Editing", "sName": "sub.login", "mDataProp": "login"} ], "aaSorting": [[2,'asc']], "sPaginationType": "full_numbers",