diff --git a/module/bug/config/table.php b/module/bug/config/table.php index 89ae83a379..ac213b96d4 100644 --- a/module/bug/config/table.php +++ b/module/bug/config/table.php @@ -171,6 +171,7 @@ $config->bug->dtable->fieldList['activatedCount']['sortType'] = true; if($config->edition != 'open') { + $app->loadLang('custom'); $config->bug->dtable->fieldList['relatedObject']['name'] = 'relatedObject'; $config->bug->dtable->fieldList['relatedObject']['title'] = $lang->custom->relateObject; $config->bug->dtable->fieldList['relatedObject']['sortType'] = false; diff --git a/module/stage/config/form.php b/module/stage/config/form.php index d92e246732..dd157e7ba9 100644 --- a/module/stage/config/form.php +++ b/module/stage/config/form.php @@ -1,26 +1,20 @@ stage->form = new stdclass(); $config->stage->form->create['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); $config->stage->form->create['type'] = array('type' => 'string', 'required' => true, 'default' => ''); -$config->stage->form->create['createdBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account); -$config->stage->form->create['createdDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now); +$config->stage->form->create['createdBy'] = array('type' => 'string', 'required' => false, 'default' => ''); +$config->stage->form->create['createdDate'] = array('type' => 'datetime', 'required' => false, 'default' => ''); if(isset($config->setPercent) && $config->setPercent == 1) $config->stage->form->create['percent'] = array('type' => 'float', 'required' => true, 'default' => 0); -$config->stage->form->batchcreate['name'] = array('type' => 'string', 'required' => false, 'default' => '', 'filter' => 'trim', 'base' => true); -$config->stage->form->batchcreate['type'] = array('type' => 'string', 'required' => false, 'default' => ''); -$config->stage->form->batchcreate['createdBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account); -$config->stage->form->batchcreate['createdDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now); +$config->stage->form->batchcreate['name'] = array('type' => 'string', 'required' => false, 'default' => '', 'filter' => 'trim', 'base' => true); +$config->stage->form->batchcreate['type'] = array('type' => 'string', 'required' => false, 'default' => ''); if(isset($config->setPercent) && $config->setPercent == 1) $config->stage->form->batchcreate['percent'] = array('type' => 'float', 'required' => true, 'default' => 0); -$config->stage->form->edit['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); -$config->stage->form->edit['type'] = array('type' => 'string', 'required' => true, 'default' => ''); -$config->stage->form->edit['editedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account); -$config->stage->form->edit['editedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now); +$config->stage->form->edit['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); +$config->stage->form->edit['type'] = array('type' => 'string', 'required' => true, 'default' => ''); if(isset($config->setPercent) && $config->setPercent == 1) $config->stage->form->edit['percent'] = array('type' => 'float', 'required' => true, 'default' => 0); $config->stage->form->settype['lang'] = array('type' => 'string', 'required' => false, 'default' => ''); diff --git a/module/stage/control.php b/module/stage/control.php index 4b6cad06f9..37da1069d7 100644 --- a/module/stage/control.php +++ b/module/stage/control.php @@ -83,7 +83,12 @@ class stage extends control { if(isset($flow->projectModel) && $flow->projectModel == 'ipd') $this->config->stage->create->requiredFields = 'name,type'; - $stageData = form::data()->setDefault('workflowGroup', $groupID)->get(); + $stageData = form::data() + ->setDefault('workflowGroup', $groupID) + ->setDefault('createdBy', $this->app->user->account) + ->setDefault('createdDate', helper::now()) + ->get(); + $stageID = $this->stage->create($stageData); if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); @@ -152,7 +157,10 @@ class stage extends control { if(isset($flow->projectModel) && $flow->projectModel == 'ipd') $this->config->stage->edit->requiredFields = 'name,type'; - $stageData = form::data()->get(); + $stageData = form::data() + ->setDefault('editedBy', $this->app->user->account) + ->setDefault('editedDate', helper::now()) + ->get(); $changes = $this->stage->update($stageID, $stageData); if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); diff --git a/module/stage/model.php b/module/stage/model.php index 59ad81e76b..a45b1512a3 100644 --- a/module/stage/model.php +++ b/module/stage/model.php @@ -100,9 +100,12 @@ class stageModel extends model $maxOrder = $this->dao->select('MAX(`order`) AS maxOrder')->from(TABLE_STAGE)->where('workflowGroup')->eq($groupID)->andWhere('deleted')->eq('0')->fetch('maxOrder'); $this->loadModel('action'); + $now = helper::now(); foreach($stages as $rowID => $stage) { $stage->workflowGroup = $groupID; + $stage->createdBy = $this->app->user->account; + $stage->createdDate = $now; if(!empty($stage->percent)) $stage->percent = (float)$stage->percent; $this->dao->insert(TABLE_STAGE)->data($stage)->autoCheck() ->batchCheck($this->config->stage->create->requiredFields, 'notempty') diff --git a/module/testcase/config/table.php b/module/testcase/config/table.php index 5753b4273f..818952c2bc 100644 --- a/module/testcase/config/table.php +++ b/module/testcase/config/table.php @@ -133,6 +133,7 @@ $config->testcase->dtable->fieldList['stepNumber']['sortType'] = false; if($config->edition != 'open') { + $app->loadLang('custom'); $config->testcase->dtable->fieldList['relatedObject']['name'] = 'relatedObject'; $config->testcase->dtable->fieldList['relatedObject']['title'] = $lang->custom->relateObject; $config->testcase->dtable->fieldList['relatedObject']['sortType'] = false;