diff --git a/module/bug/model.php b/module/bug/model.php index f43c797404..f800f83094 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -1688,7 +1688,7 @@ class bugModel extends model $bugIDList = array(); if($moduleName == 'contributeBug') { - $bugsAssignedByMe = $this->loadModel('my')->getAssignedByMe($account, 0, '', $orderBy, 0, 'bug'); + $bugsAssignedByMe = $this->loadModel('my')->getAssignedByMe($account, 0, '', $orderBy, 'bug'); foreach($bugsAssignedByMe as $bugID => $bug) $bugIDList[$bugID] = $bugID; } diff --git a/module/my/control.php b/module/my/control.php index d04963cd19..68a32b6cf2 100755 --- a/module/my/control.php +++ b/module/my/control.php @@ -336,7 +336,7 @@ EOF; if($type == 'assignedBy') { - $stories = $this->loadModel('my')->getAssignedByMe($this->app->user->account, '', $pager, $orderBy, '', 'story'); + $stories = $this->loadModel('my')->getAssignedByMe($this->app->user->account, '', $pager, $orderBy, 'story'); } elseif($type == 'bysearch') { @@ -400,7 +400,7 @@ EOF; if($type == 'assignedBy') { - $stories = $this->loadModel('my')->getAssignedByMe($this->app->user->account, '', $pager, $orderBy, '', 'requirement'); + $stories = $this->loadModel('my')->getAssignedByMe($this->app->user->account, '', $pager, $orderBy, 'requirement'); } elseif($type == 'bysearch') { @@ -468,7 +468,7 @@ EOF; /* Get tasks. */ if($type == 'assignedBy') { - $tasks = $this->my->getAssignedByMe($this->app->user->account, 0, $pager, $sort, 0, 'task'); + $tasks = $this->my->getAssignedByMe($this->app->user->account, 0, $pager, $sort, 'task'); } elseif($type == 'bySearch') { @@ -571,7 +571,7 @@ EOF; $sort = common::appendOrder($orderBy); if($type == 'assignedBy') { - $bugs = $this->loadModel('my')->getAssignedByMe($this->app->user->account, '', $pager, $orderBy, '', 'bug'); + $bugs = $this->loadModel('my')->getAssignedByMe($this->app->user->account, '', $pager, $orderBy, 'bug'); } else { @@ -877,7 +877,7 @@ EOF; $this->view->pager = $pager; $this->view->type = $type; $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->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(); @@ -911,7 +911,7 @@ EOF; /* Get risks by type*/ if($type == 'assignedBy') { - $risks = $this->my->getAssignedByMe($this->app->user->account, '', $pager, $orderBy, '', 'risk'); + $risks = $this->my->getAssignedByMe($this->app->user->account, '', $pager, $orderBy, 'risk'); } else { @@ -1002,7 +1002,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, '', $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 : ''); diff --git a/module/my/model.php b/module/my/model.php index 62c0185ea2..5e85d1590f 100644 --- a/module/my/model.php +++ b/module/my/model.php @@ -322,7 +322,7 @@ class myModel extends model * @access public * @return array */ - public function getAssignedByMe($account, $limit = 0, $pager = null, $orderBy = "id_desc", $projectID = 0, $objectType = '') + public function getAssignedByMe($account, $limit = 0, $pager = null, $orderBy = "id_desc", $objectType = '') { $module = $objectType == 'requirement' ? 'story' : $objectType; $this->loadModel($module); @@ -550,7 +550,7 @@ class myModel extends model $taskIDList = array(); if($moduleName == 'contributeTask') { - $tasksAssignedByMe = $this->getAssignedByMe($account, 0, '', $orderBy, 0, 'task'); + $tasksAssignedByMe = $this->getAssignedByMe($account, 0, '', $orderBy, 'task'); foreach($tasksAssignedByMe as $taskID => $task) { $taskIDList[$taskID] = $taskID; @@ -725,7 +725,7 @@ class myModel extends model if($type == 'contribute') { - $assignedByMe = $this->getAssignedByMe($this->app->user->account, '', $pager, $orderBy, '', 'risk'); + $assignedByMe = $this->getAssignedByMe($this->app->user->account, '', $pager, $orderBy, 'risk'); $risks = $this->dao->select('*')->from(TABLE_RISK) ->where($riskQuery) @@ -822,7 +822,7 @@ class myModel extends model $storyIDList = array(); if($type == 'contribute') { - $storiesAssignedByMe = $this->getAssignedByMe($this->app->user->account, '', '', $orderBy, '', 'story'); + $storiesAssignedByMe = $this->getAssignedByMe($this->app->user->account, '', '', $orderBy, 'story'); foreach($storiesAssignedByMe as $storyID => $story) { $storyIDList[$storyID] = $storyID; @@ -941,7 +941,7 @@ class myModel extends model $requirementIDList = array(); if($type == 'contribute') { - $requirementsAssignedByMe = $this->getAssignedByMe($this->app->user->account, '', $pager, $orderBy, '', 'requirement'); + $requirementsAssignedByMe = $this->getAssignedByMe($this->app->user->account, '', $pager, $orderBy, 'requirement'); foreach($requirementsAssignedByMe as $requirementID => $requirement) { $requirementIDList[$requirementID] = $requirementID;