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

sprint_fixbug

Browse Source
This commit is contained in:
sunjun
2022-05-18 00:59:07 +00:00
parent ae9e3b7df4
commit fca85b0bcc
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/control.php
+4 -4
View File
@@ -407,7 +407,7 @@ EOF;
/* Get tasks. */
if($type == 'assignedBy')
{
$tasks = $this->my->getAssignedByMe($this->app->user->account, $type, 0, $pager, $sort, 0, 'task');
$tasks = $this->my->getAssignedByMe($this->app->user->account, 0, $pager, $sort, 0, 'task');
}
else
{
@@ -759,7 +759,7 @@ 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, $type, '', $pager, $orderBy, '', 'issue') : $this->loadModel('issue')->getUserIssues($type, $this->app->user->account, $orderBy, $pager);
$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->projectList = $this->loadModel('project')->getPairsByProgram();
@@ -788,7 +788,7 @@ EOF;
$this->view->title = $this->lang->my->risk;
$this->view->position[] = $this->lang->my->risk;
$this->view->risks = $type == 'assignedBy' ? $this->loadModel('my')->getAssignedByMe($this->app->user->account, $type, '', $pager, $orderBy, '', 'risk') : $this->loadModel('risk')->getUserRisks($type, $this->app->user->account, $orderBy, $pager);
$this->view->risks = $type == 'assignedBy' ? $this->loadModel('my')->getAssignedByMe($this->app->user->account, '', $pager, $orderBy, '', 'risk') : $this->loadModel('risk')->getUserRisks($type, $this->app->user->account, $orderBy, $pager);
$this->view->users = $this->loadModel('user')->getPairs('noclosed|noletter');
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
@@ -856,7 +856,7 @@ EOF;
$this->app->loadClass('pager', $static = true);
if($this->app->getViewType() == 'mhtml') $recPerPage = 10;
$pager = pager::init($recTotal, $recPerPage, $pageID);
$ncList = $browseType == 'assignedBy' ? $this->loadModel('my')->getAssignedByMe($this->app->user->account, $browseType, '', $pager, $orderBy, '', 'nc') : $this->my->getNcList($browseType, $orderBy, $pager, 'active');
$ncList = $browseType == 'assignedBy' ? $this->loadModel('my')->getAssignedByMe($this->app->user->account, '', $pager, $orderBy, '', 'nc') : $this->my->getNcList($browseType, $orderBy, $pager, 'active');
foreach($ncList as $nc) $ncIdList[] = $nc->id;
$this->session->set('ncIdList', isset($ncIdList) ? $ncIdList : '');
module/my/model.php
+2 -1
View File
@@ -309,7 +309,7 @@ class myModel extends model
return $actions;
}
public function getAssignedByMe($account, $type = 'assignedBy', $limit = 0, $pager = null, $orderBy = "id_desc", $projectID = 0, $objectType = '')
public function getAssignedByMe($account, $limit = 0, $pager = null, $orderBy = "id_desc", $projectID = 0, $objectType = '')
{
$this->loadModel($objectType);
$objectList = $this->dao->select('t1.*')
@@ -321,6 +321,7 @@ class myModel extends model
->orderBy($orderBy)
->page($pager, 't1.id')
->fetchAll('id');
if($objectType == 'task')
{
$projectList = array();