|
@@ -29,7 +29,6 @@ class Route_ViewTableAjax extends RouteBase {
|
|
|
}
|
|
}
|
|
|
$tbl->setSyncUrl($syncUrl);
|
|
$tbl->setSyncUrl($syncUrl);
|
|
|
$tbl->setLabel($tblLabel);
|
|
$tbl->setLabel($tblLabel);
|
|
|
- $tbl->setFilterInit($filterInit);
|
|
|
|
|
$tbl->addRowFunction('edit');
|
|
$tbl->addRowFunction('edit');
|
|
|
$tbl->addRowFunction('hist');
|
|
$tbl->addRowFunction('hist');
|
|
|
$tbl->addRowFunction('files');
|
|
$tbl->addRowFunction('files');
|
|
@@ -52,7 +51,7 @@ class Route_ViewTableAjax extends RouteBase {
|
|
|
|
|
|
|
|
$forceFilterInit = array();
|
|
$forceFilterInit = array();
|
|
|
$filterInit = new stdClass();
|
|
$filterInit = new stdClass();
|
|
|
- $filterInit->currSortCol = 'ID';
|
|
|
|
|
|
|
+ $filterInit->currSortCol = $acl->getPrimaryKeyField();
|
|
|
$filterInit->currSortFlip = 'desc';
|
|
$filterInit->currSortFlip = 'desc';
|
|
|
foreach ($_GET as $k => $v) {
|
|
foreach ($_GET as $k => $v) {
|
|
|
if (strlen($k) > 3 && substr($k, 0, 2) == 'f_' && !empty($v)) {// filter prefix
|
|
if (strlen($k) > 3 && substr($k, 0, 2) == 'f_' && !empty($v)) {// filter prefix
|
|
@@ -68,6 +67,7 @@ class Route_ViewTableAjax extends RouteBase {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
$tbl = $this->getTableAjaxWidget($acl);
|
|
$tbl = $this->getTableAjaxWidget($acl);
|
|
|
|
|
+ $tbl->setFilterInit($filterInit);
|
|
|
if (!empty($forceFilterInit)) $tbl->setForceFilterInit($forceFilterInit);
|
|
if (!empty($forceFilterInit)) $tbl->setForceFilterInit($forceFilterInit);
|
|
|
echo $tbl->render();
|
|
echo $tbl->render();
|
|
|
|
|
|
