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

Merge branch 'sprint199_zg' into 'master'

Browse Source 
* Finish task#56549,56552

See merge request easycorp/zentaopms!3842
This commit is contained in:
孙广明
2022-06-10 01:03:54 +00:00
parent 0d4fe6983d 8c5c2f2149
commit 45d130f354
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/control.php
+10 -3
View File
@@ -163,7 +163,7 @@ class my extends control
$this->loadModel('meeting');
/* Get the number of issues assigned to me. */
$issues = $this->issue->getUserIssues('assignedTo', $this->app->user->account, 'id_desc', $pager);
$issues = $this->issue->getUserIssues('assignedTo', 0, $this->app->user->account, 'id_desc', $pager);
$issueCount = $pager->recTotal;
/* Get the number of risks assigned to me. */
@@ -803,12 +803,18 @@ EOF;
* @param int $pageID
* @return void
*/
public function issue($type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
public function issue($type = 'assignedTo', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
/* Set the pager. */
$this->app->loadClass('pager', $static = true);
$pager = new pager($recTotal, $recPerPage, $pageID);
/* Build the search form. */
$browseType = strtolower($type);
$queryID = ($browseType == 'bysearch') ? (int)$param : 0;
$actionURL = $this->createLink('my', $this->app->rawMethod, "mode=issue&type=bySearch&param=myQueryID");
$this->loadModel('issue')->buildSearchForm($actionURL, $queryID);
$this->app->session->set('issueList', $this->app->getURI(true), 'project');
$this->view->title = $this->lang->my->issue;
@@ -818,7 +824,8 @@ EOF;
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
$this->view->type = $type;
$this->view->issues = $type == 'assignedBy' ? $this->loadModel('my')->getAssignedByMe($this->app->user->account, '', $pager, $orderBy, '', 'issue') : $this->loadModel('issue')->getUserIssues($type, $this->app->user->account, $orderBy, $pager);
$this->view->param = $param;
$this->view->issues = $type == 'assignedBy' ? $this->loadModel('my')->getAssignedByMe($this->app->user->account, '', $pager, $orderBy, '', 'issue') : $this->loadModel('issue')->getUserIssues($type, $queryID, $this->app->user->account, $orderBy, $pager);
$this->view->projectList = $this->loadModel('project')->getPairsByProgram();
module/user/control.php
+1 -1
View File
@@ -401,7 +401,7 @@ class user extends control
$this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->issue;
$this->view->position[] = $this->lang->user->issue;
$this->view->issues = $this->loadModel('issue')->getUserIssues($type, $account, $orderBy, $pager);
$this->view->issues = $this->loadModel('issue')->getUserIssues($type, 0, $account, $orderBy, $pager);
$this->view->user = $user;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->type = $type;