Cleaned up code.
This commit is contained in:
parent
4c1d719bf0
commit
e5085f0df3
3 changed files with 39 additions and 23 deletions
|
@ -57,7 +57,9 @@ class Application_Model_Datatables
|
|||
public static function findEntries($con, $displayColumns, $fromTable,
|
||||
$data, $dataProp = "aaData")
|
||||
{
|
||||
$librarySetting = Application_Model_Preference::getCurrentLibraryTableColumnMap();
|
||||
//$librarySetting = Application_Model_Preference::getCurrentLibraryTableColumnMap();
|
||||
$librarySetting =
|
||||
Application_Model_Preference::getCurrentLibraryTableColumnMap();
|
||||
//$displayColumns[] = 'owner';
|
||||
|
||||
// map that maps original column position to db name
|
||||
|
@ -95,9 +97,8 @@ class Application_Model_Datatables
|
|||
}
|
||||
|
||||
$where = array();
|
||||
/* Holds the parameters for binding after the
|
||||
* statement has been prepared
|
||||
*/
|
||||
/* Holds the parameters for binding after the statement has been
|
||||
prepared */
|
||||
$params = array();
|
||||
|
||||
$advancedWhere = self::buildWhereClauseForAdvancedSearch($dbname2searchTerm);
|
||||
|
|
|
@ -1092,26 +1092,41 @@ class Application_Model_Preference
|
|||
}
|
||||
|
||||
|
||||
public static function getCurrentLibraryTableColumnMap()
|
||||
|
||||
public static function getOrderingMap($pref_param)
|
||||
{
|
||||
$v = self::getValue("library_datatable", true);
|
||||
$v = self::getValue($pref_param, true);
|
||||
|
||||
$id = function ($x) { return $x; };
|
||||
|
||||
if ($v === '') {
|
||||
return function ($x) { return $x; };
|
||||
} else {
|
||||
return $id;
|
||||
}
|
||||
|
||||
$ds = unserialize($v);
|
||||
|
||||
if (!array_key_exists('ColReorder', $ds)) {
|
||||
return $id;
|
||||
}
|
||||
|
||||
return function ($x) use ($ds) {
|
||||
if (array_key_exists($x, $ds['ColReorder'])) {
|
||||
return $ds['ColReorder'][$x];
|
||||
} else {
|
||||
/*For now we just have this hack for debugging. We should not
|
||||
rely on this crappy behaviour in case of failure*/
|
||||
Logging::info("Pref: $pref_param");
|
||||
Logging::warn("Index $x does not exist preferences");
|
||||
Logging::warn("Defaulting to identity and printing
|
||||
preferences");
|
||||
Logging::warn("Defaulting to identity and printing preferences");
|
||||
Logging::warn($ds);
|
||||
return $x;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public static function getCurrentLibraryTableColumnMap()
|
||||
{
|
||||
return self::getOrderingMap("library_datatable");
|
||||
}
|
||||
|
||||
public static function setCurrentLibraryTableSetting($settings)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue