Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Finish task #107884.

Browse Source
This commit is contained in:
hufangzhou
2023-12-13 08:34:52 +08:00
parent 2016a44272
commit 5f69e2a5eb
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
config/filter.php
View File

@@ -25,15 +25,16 @@ $filter->default->get['_nocache'] = 'equal::1';
$filter->default->get['tid'] = 'reg::word';
$filter->default->get['HTTP_X_REQUESTED_WITH'] = 'equal::XMLHttpRequest';
$filter->default->cookie['lang'] = 'reg::lang';
$filter->default->cookie['theme'] = 'reg::word';
$filter->default->cookie['fingerprint'] = 'reg::word';
$filter->default->cookie['hideMenu'] = 'equal::true';
$filter->default->cookie['tab'] = 'reg::word';
$filter->default->cookie['goback'] = 'reg::any';
$filter->default->cookie['maxImport'] = 'reg::any';
$filter->default->cookie['za'] = 'reg::any';
$filter->default->cookie['zp'] = 'reg::any';
$filter->default->cookie['lang'] = 'reg::lang';
$filter->default->cookie['theme'] = 'reg::word';
$filter->default->cookie['fingerprint'] = 'reg::word';
$filter->default->cookie['hideMenu'] = 'equal::true';
$filter->default->cookie['tab'] = 'reg::word';
$filter->default->cookie['goback'] = 'reg::any';
$filter->default->cookie['maxImport'] = 'reg::any';
$filter->default->cookie['za'] = 'reg::any';
$filter->default->cookie['zp'] = 'reg::any';
$filter->default->cookie['historyOrder'] = 'reg::word';
$filter->index = new stdclass();
$filter->my = new stdclass();

3
module/action/model.php
View File

@@ -352,6 +352,7 @@ class actionModel extends model
*/
public function getList($objectType, $objectID)
{
$orderBy = isset($_COOKIE['historyOrder']) && $this->cookie->historyOrder == 'desc' ? 'date_desc, id_desc' : 'date_asc, id_asc';
$objectID = is_array($objectID) ? $objectID : (int)$objectID;
$modules = $objectType == 'module' ? $this->dao->select('id')->from(TABLE_MODULE)->where('root')->in($objectID)->fetchPairs('id') : array();
$commiters = $this->loadModel('user')->getCommiters();
@@ -377,7 +378,7 @@ class actionModel extends model
->where('objectType')->eq($objectType)
->andWhere('objectID')->in($objectID)
->fi()
->orderBy('date, id')
->orderBy($orderBy)
->fetchAll('id');
$histories = $this->getHistory(array_keys($actions));

9
module/common/view/action.html.php
View File

@@ -32,7 +32,8 @@
<?php endif;?>
<?php echo $lang->history?> &nbsp;
<button type="button" class="btn btn-mini btn-icon btn-reverse" title='<?php echo $lang->reverse;?>'>
<i class="icon icon-arrow-up icon-sm"></i>
<?php $reverseBtnClass = isset($_COOKIE['historyOrder']) && $this->cookie->historyOrder == 'desc' ? 'icon-arrow-down' : 'icon-arrow-up';?>
<i class="icon <?php echo $reverseBtnClass;?> icon-sm"></i>
</button>
<button type="button" class="btn btn-mini btn-icon btn-expand-all" title='<?php echo $lang->switchDisplay;?>'>
<i class="icon icon-plus icon-sm"></i>
@@ -104,3 +105,9 @@
</ol>
</div>
</div>
<script>
$(document).on('historiesReverse', '.histories-list', function(event, isAsc)
{
$.cookie('historyOrder', isAsc ? 'asc' : 'desc', {expires:config.cookieLife, path:config.webRoot});
});
</script>