Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
Martin Konecny 2012-09-19 16:56:04 -04:00
parent 84ed03ffac f2e495cbd8
commit 40c122fafa
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
airtime_mvc/application/models/Datatables.php
View File

@ -100,10 +100,12 @@ class Application_Model_Datatables
*/ */
$params = array(); $params = array();
$advancedWhere = self::buildWhereClauseForAdvancedSearch($dbname2searchTerm); if ($data['advSearch'] === 'true') {
if (!empty($advancedWhere['clause'])) { $advancedWhere = self::buildWhereClauseForAdvancedSearch($dbname2searchTerm);
$where[] = join(" AND ", $advancedWhere['clause']); if (!empty($advancedWhere['clause'])) {
$params = $advancedWhere['params']; $where[] = join(" AND ", $advancedWhere['clause']);
$params = $advancedWhere['params'];
}
} }
if ($data["sSearch"] !== "") { if ($data["sSearch"] !== "") {

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

@ -525,8 +525,17 @@ var AIRTIME = (function(AIRTIME) {
"sAjaxDataProp": "files", "sAjaxDataProp": "files",
"fnServerData": function ( sSource, aoData, fnCallback ) { "fnServerData": function ( sSource, aoData, fnCallback ) {
/* The real validation check is done in dataTables.columnFilter.js
* We also need to check it here because datatable is redrawn everytime
* an action is performed in the Library page.
* In order for datatable to redraw the advanced search fields
* MUST all be valid.
*/
var advSearchFields = $("div#advanced_search").children(':visible');
var advSearchValid = validateAdvancedSearch(advSearchFields);
var type; var type;
aoData.push( { name: "format", value: "json"} ); aoData.push( { name: "format", value: "json"} );
aoData.push( { name: "advSearch", value: advSearchValid} );
//push whether to search files/playlists or all. //push whether to search files/playlists or all.
type = $("#library_display_type").find("select").val(); type = $("#library_display_type").find("select").val();