diff --git a/module/issue/model.php b/module/issue/model.php index 8985b11d8c..9273b7eb1f 100644 --- a/module/issue/model.php +++ b/module/issue/model.php @@ -25,7 +25,7 @@ class issueModel extends model $data = fixer::input('post') ->add('createdBy', $this->app->user->account) ->add('createdDate', $now) - ->add('program', $this->session->PRJ) + ->add('PRJ', $this->session->PRJ) ->remove('labels,files') ->addIF($this->post->assignedTo, 'assignedBy', $this->app->user->account) ->addIF($this->post->assignedTo, 'assignedDate', $now) diff --git a/module/project/model.php b/module/project/model.php index 183c5e3403..29b8d1fe33 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -767,7 +767,7 @@ class projectModel extends model */ public function getList($status = 'all', $limit = 0, $productID = 0, $branch = 0, $programID = 0) { - $programID = $programID ? $programID : $this->session->PRJID; + $programID = $programID ? $programID : $this->session->PRJ; if($status == 'involved') return $this->getInvolvedList($status, $limit, $productID, $branch); if($productID != 0) diff --git a/module/risk/model.php b/module/risk/model.php index 5335a18a58..b606c4e515 100644 --- a/module/risk/model.php +++ b/module/risk/model.php @@ -22,7 +22,7 @@ class riskModel extends model public function create() { $risk = fixer::input('post') - ->add('program', $this->session->PRJ) + ->add('PRJ', $this->session->PRJ) ->add('createdBy', $this->app->user->account) ->add('createdDate', helper::today()) ->stripTags($this->config->risk->editor->create['id'], $this->config->allowedTags) @@ -56,7 +56,7 @@ class riskModel extends model $risk->source = $data->source[$i]; $risk->category = $data->category[$i]; $risk->strategy = $data->strategy[$i]; - $risk->program = $this->session->PRJ; + $risk->PRJ = $this->session->PRJ; $risk->createdBy = $this->app->user->account; $risk->createdDate = helper::today(); @@ -136,7 +136,7 @@ class riskModel extends model ->where('deleted')->eq(0) ->beginIF($browseType != 'all' and $browseType != 'assignTo')->andWhere('status')->eq($browseType)->fi() ->beginIF($browseType == 'assignTo')->andWhere('assignedTo')->eq($this->app->user->account)->fi() - ->andWhere('program')->eq($programID) + ->andWhere('PRJ')->eq($programID) ->orderBy($orderBy) ->page($pager) ->fetchAll('id'); @@ -177,7 +177,7 @@ class riskModel extends model return $this->dao->select('*')->from(TABLE_RISK) ->where($riskQuery) ->andWhere('deleted')->eq('0') - ->andWhere('program')->eq($programID) + ->andWhere('PRJ')->eq($programID) ->orderBy($orderBy) ->page($pager) ->fetchAll('id'); @@ -194,7 +194,7 @@ class riskModel extends model { return $this->dao->select('id, name')->from(TABLE_RISK) ->where('deleted')->eq(0) - ->andWhere('program')->eq($programID) + ->andWhere('PRJ')->eq($programID) ->fetchPairs(); } @@ -223,7 +223,7 @@ class riskModel extends model public function getBlockRisks($programID, $browseType = 'all', $limit = 15, $orderBy = 'id_desc') { return $this->dao->select('*')->from(TABLE_RISK) - ->where('program')->eq($programID) + ->where('PRJ')->eq($programID) ->beginIF($browseType != 'all' and $browseType != 'assignTo')->andWhere('status')->eq($browseType)->fi() ->beginIF($browseType == 'assignTo')->andWhere('assignedTo')->eq($this->app->user->account)->fi() ->andWhere('deleted')->eq('0') diff --git a/module/task/model.php b/module/task/model.php index 6157c79312..03a909ff04 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -36,7 +36,7 @@ class taskModel extends model ->setDefault('project', $projectID) ->setDefault('estimate,left,story', 0) ->setDefault('status', 'wait') - ->setDefault('program', $this->session->PRJ) + ->setDefault('PRJ', $this->session->PRJ) ->setIF($this->post->estimate != false, 'left', $this->post->estimate) ->setIF($this->post->story != false, 'storyVersion', $this->loadModel('story')->getVersion($this->post->story)) ->setDefault('estStarted', '0000-00-00') @@ -300,7 +300,7 @@ class taskModel extends model $data[$i]->pri = $tasks->pri[$i]; $data[$i]->estimate = $tasks->estimate[$i]; $data[$i]->left = $tasks->estimate[$i]; - $data[$i]->program = $this->session->PRJ; + $data[$i]->PRJ = $this->session->PRJ; $data[$i]->project = $projectID; $data[$i]->estStarted = empty($tasks->estStarted[$i]) ? '0000-00-00' : $tasks->estStarted[$i]; $data[$i]->deadline = empty($tasks->deadline[$i]) ? '0000-00-00' : $tasks->deadline[$i];