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

* finish task #4705.

Browse Source
This commit is contained in:
wangyidong
2018-09-12 16:01:05 +08:00
parent 78a5318cae
commit bd7e6c0d0f
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/user/control.php
+3 -2
View File
@@ -900,7 +900,7 @@ class user extends control
* @access public
* @return void
*/
public function dynamic($period = 'today', $account = '', $recTotal = 0, $direction = 'next')
public function dynamic($period = 'today', $account = '', $recTotal = 0, $date = '', $direction = 'next')
{
/* set menus. */
$this->lang->set('menugroup.user', 'company');
@@ -926,8 +926,9 @@ class user extends control
/* Append id for secend sort. */
$orderBy = $direction == 'next' ? 'date_desc' : 'date_asc';
$sort = $this->loadModel('common')->appendOrder($orderBy);
$date = empty($date) ? '' : date('Y-m-d', $date);
$actions = $this->loadModel('action')->getDynamic($account, $period, $orderBy, $pager);
$actions = $this->loadModel('action')->getDynamic($account, $period, $sort, $pager, 'all', 'all', $date, $direction);
$this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->dynamic;
$this->view->position[] = $this->lang->user->dynamic;