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

CC-3174 : showbuilder 

datatables state restore needs real booleans not strings.
This commit is contained in:
Naomi Aro 2012-02-22 00:02:35 +01:00
parent 9b5a0fc565
commit 5f89975c64
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/controllers/LibraryController.php
View File

@ -47,7 +47,7 @@ class LibraryController extends Zend_Controller_Action
$this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.pluginAPI.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.pluginAPI.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.fnSetFilteringDelay.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.fnSetFilteringDelay.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColVis.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColVis.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColReorder.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColReorderResize.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.FixedColumns.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.FixedColumns.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.TableTools.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.TableTools.js?'.$CC_CONFIG['airtime_version'],'text/javascript');

22
airtime_mvc/public/js/airtime/library/library.js
View File

@ -221,6 +221,10 @@ $(document).ready(function() {
"bServerSide": true, "bServerSide": true,
"bStateSave": true, "bStateSave": true,
"fnStateSaveParams": function (oSettings, oData) {
oData.oSearch.sSearch = "";
},
"fnStateSave": function (oSettings, oData) { "fnStateSave": function (oSettings, oData) {
$.ajax({ $.ajax({
@ -228,9 +232,7 @@ $(document).ready(function() {
type: "POST", type: "POST",
data: {settings : oData, format: "json"}, data: {settings : oData, format: "json"},
dataType: "json", dataType: "json",
success: function(){ success: function(){},
var x;
},
error: function (jqXHR, textStatus, errorThrown) { error: function (jqXHR, textStatus, errorThrown) {
var x; var x;
} }
@ -255,16 +257,26 @@ $(document).ready(function() {
return o; return o;
}, },
"fnStateLoadParams": function (oSettings, oData) {
var i,
length,
a = oData.abVisCols;
//datatables needs boolean type to work properly.
for (i = 0, length = oData.abVisCols.length; i < length; i++) {
a[i] = (a[i] === "true") ? true : false;
}
},
"sAjaxSource": "/Library/contents", "sAjaxSource": "/Library/contents",
"fnServerData": function ( sSource, aoData, testCallback ) { "fnServerData": function ( sSource, aoData, fnCallback ) {
aoData.push( { name: "format", value: "json"} ); aoData.push( { name: "format", value: "json"} );
$.ajax( { $.ajax( {
"dataType": 'json', "dataType": 'json',
"type": "GET", "type": "GET",
"url": sSource, "url": sSource,
"data": aoData, "data": aoData,
"success": testCallback "success": fnCallback
} ); } );
}, },
"fnRowCallback": AIRTIME.library.events.fnRowCallback, "fnRowCallback": AIRTIME.library.events.fnRowCallback,