diff --git a/module/bug/model.php b/module/bug/model.php index fc69eec36c..3bfa4fa363 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -63,12 +63,12 @@ class bugModel extends model { $now = helper::now(); $bug = fixer::input('post') - ->setDefault('PRJ', $this->session->PRJ) ->setDefault('openedBy', $this->app->user->account) ->setDefault('openedDate', $now) ->setDefault('project,story,task', 0) ->setDefault('openedBuild', '') ->setDefault('deadline', '0000-00-00') + ->setIF($this->config->global->mode == 'new', 'PRJ', $this->session->PRJ) ->setIF(strpos($this->config->bug->create->requiredFields, 'deadline') !== false, 'deadline', $this->post->deadline) ->setIF($this->post->assignedTo != '', 'assignedDate', $now) ->setIF($this->post->story != false, 'storyVersion', $this->loadModel('story')->getVersion($this->post->story)) @@ -230,7 +230,7 @@ class bugModel extends model } } - $bug->PRJ = $this->session->PRJ; + if($this->config->global->mode == 'new') $bug->PRJ = $this->session->PRJ; $this->dao->insert(TABLE_BUG)->data($bug) ->autoCheck() ->batchCheck($this->config->bug->create->requiredFields, 'notempty') diff --git a/module/caselib/model.php b/module/caselib/model.php index 7da3933270..692d10ab64 100644 --- a/module/caselib/model.php +++ b/module/caselib/model.php @@ -219,7 +219,7 @@ class caselibModel extends model $lib = fixer::input('post') ->stripTags($this->config->caselib->editor->create['id'], $this->config->allowedTags) ->setForce('type', 'library') - ->add('PRJ', $this->session->PRJ) + ->setIF($this->config->global->mode == 'new', 'PRJ', $this->session->PRJ) ->add('addedBy', $this->app->user->account) ->add('addedDate', helper::now()) ->remove('uid') @@ -612,7 +612,7 @@ class caselibModel extends model $data[$i]->openedDate = $now; $data[$i]->status = $forceNotReview ? 'normal' : 'wait'; $data[$i]->version = 1; - $data[$i]->PRJ = $this->session->PRJ; + if($this->config->global->mode == 'new') $data[$i]->PRJ = $this->session->PRJ; $this->dao->insert(TABLE_CASE)->data($data[$i]) ->autoCheck() diff --git a/module/testcase/model.php b/module/testcase/model.php index bd48e6f3b1..bb2776b08d 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -67,9 +67,9 @@ class testcaseModel extends model ->add('status', $status) ->add('version', 1) ->add('fromBug', $bugID) - ->add('PRJ', $this->session->PRJ) ->setDefault('openedBy', $this->app->user->account) ->setDefault('openedDate', $now) + ->setIF($this->config->global->mode == 'new', 'PRJ', $this->session->PRJ) ->setIF($this->post->story != false, 'storyVersion', $this->loadModel('story')->getVersion((int)$this->post->story)) ->remove('steps,expects,files,labels,stepType,forceNotReview') ->setDefault('story', 0) @@ -161,7 +161,7 @@ class testcaseModel extends model $data[$i] = new stdclass(); $data[$i]->product = $productID; - $data[$i]->PRJ = $this->session->PRJ; + if($this->config->global->mode == 'new') $data[$i]->PRJ = $this->session->PRJ; $data[$i]->branch = $cases->branch[$i]; $data[$i]->module = $cases->module[$i]; $data[$i]->type = $cases->type[$i]; @@ -1120,7 +1120,7 @@ class testcaseModel extends model } else { - $caseData->PRJ = $this->session->PRJ; + if($this->config->global->mode == 'new') $caseData->PRJ = $this->session->PRJ; $caseData->version = 1; $caseData->openedBy = $this->app->user->account; $caseData->openedDate = $now; diff --git a/module/testtask/model.php b/module/testtask/model.php index 4b36961c50..ce77d71463 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -147,7 +147,7 @@ class testtaskModel extends model { $task = fixer::input('post') ->setDefault('build', '') - ->setDefault('PRJ', $this->session->PRJ) + ->setIF($this->config->global->mode == 'new', 'PRJ', $this->session->PRJ) ->stripTags($this->config->testtask->editor->create['id'], $this->config->allowedTags) ->join('mailto', ',') ->remove('uid,contactListMenu')