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

Fix some issues with search, hack to always display options buttons in library view

Browse source
This commit is contained in:
Duncan Sommerville 2015-09-02 18:17:11 -04:00
parent ab11974799
commit daf854af04
2 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
airtime_mvc/application/models/Datatables.php
View file

@ -69,8 +69,7 @@ class Application_Model_Datatables
if (isset($data['advSearch']) && $data['advSearch'] === 'true') { if (isset($data['advSearch']) && $data['advSearch'] === 'true') {
$librarySetting = $librarySetting = Application_Model_Preference::getCurrentLibraryTableColumnMap();
Application_Model_Preference::getCurrentLibraryTableColumnMap();
//$displayColumns[] = 'owner'; //$displayColumns[] = 'owner';
// map that maps original column position to db name // map that maps original column position to db name

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

@ -627,22 +627,24 @@ var AIRTIME = (function(AIRTIME) {
}, },
"fnStateSave": function (oSettings, oData) { "fnStateSave": function (oSettings, oData) {
localStorage.setItem('datatables-library', JSON.stringify(oData)); localStorage.setItem('datatables-library', JSON.stringify(oData));
/*
// Sadly, this is necessary because we need to unscramble the colReorder map on the backend
$.ajax({ $.ajax({
url: baseUrl+"usersettings/set-library-datatable", url: baseUrl + "usersettings/set-library-datatable",
type: "POST", type: "POST",
data: {settings : oData, format: "json"}, data: {settings: oData, format: "json"},
dataType: "json" dataType: "json"
}); });
*/
colReorderMap = oData.ColReorder; colReorderMap = oData.ColReorder;
}, },
"fnStateLoad": function fnLibStateLoad(oSettings) { "fnStateLoad": function fnLibStateLoad(oSettings) {
var settings = localStorage.getItem('datatables-library'); var settings = JSON.parse(localStorage.getItem('datatables-library'));
// Hacky; always set the visibility of the last column (actions buttons) to true
settings.abVisCols[settings.abVisCols.length - 1] = true;
try { try {
return JSON.parse(settings); return settings;
} catch (e) { } catch (e) {
return null; return null;
} }
@ -690,7 +692,6 @@ var AIRTIME = (function(AIRTIME) {
*/ */
var advSearchFields = $("div#advanced_search").children(':visible'); var advSearchFields = $("div#advanced_search").children(':visible');
var advSearchValid = validateAdvancedSearch(advSearchFields); var advSearchValid = validateAdvancedSearch(advSearchFields);
advSearchFields.val("TEST");
var type; var type;
aoData.push( { name: "format", value: "json"} ); aoData.push( { name: "format", value: "json"} );
aoData.push( { name: "advSearch", value: advSearchValid} ); aoData.push( { name: "advSearch", value: advSearchValid} );
@ -700,7 +701,7 @@ var AIRTIME = (function(AIRTIME) {
type = (type === undefined) ? 1 : type; type = (type === undefined) ? 1 : type;
aoData.push( { name: "type", value: type} ); aoData.push( { name: "type", value: type} );
getUsabilityHint(); //getUsabilityHint();
$.ajax({ $.ajax({
"dataType": 'json', "dataType": 'json',
@ -709,6 +710,11 @@ var AIRTIME = (function(AIRTIME) {
"data": aoData, "data": aoData,
"success": fnCallback, "success": fnCallback,
"error": handleAjaxError "error": handleAjaxError
}).done(function(data) {
if (data.iTotalRecords > data.iTotalDisplayRecords) {
$('#library_empty').hide();
$('#library_display').find('tr:has(td.dataTables_empty)').show();
}
}); });
}, },
"fnRowCallback": AIRTIME.library.fnRowCallback, "fnRowCallback": AIRTIME.library.fnRowCallback,