diff --git a/module/entry/model.php b/module/entry/model.php index faa5e7ac4a..7c7fcff16b 100644 --- a/module/entry/model.php +++ b/module/entry/model.php @@ -57,6 +57,7 @@ class entryModel extends model */ public function getList($orderBy = 'id_desc', $pager = null) { + if(strpos($orderBy, 'desc_') !== false) $orderBy = str_replace('desc_', '`desc`_', $orderBy); return $this->dao->select('*')->from(TABLE_ENTRY)->where('deleted')->eq('0')->orderBy($orderBy)->page($pager)->fetchAll('id'); } diff --git a/module/entry/ui/browse.html.php b/module/entry/ui/browse.html.php index 51b60ddb63..706d426a6e 100644 --- a/module/entry/ui/browse.html.php +++ b/module/entry/ui/browse.html.php @@ -30,6 +30,8 @@ dtable set::cols($this->config->entry->dtable->fieldList), set::data($tableData), set::fixedLeftWidth('0.33'), + set::orderBy($orderBy), + set::sortLink(createLink('entry', 'browse', "orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")), set::footer(jsRaw("function(){return window.footerGenerator.call(this, '" . sprintf($lang->entry->summaryTip, count($tableData)) . "');}")), set::footPager(usePager()), );