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

* [misc] fix code error.

Browse Source
This commit is contained in:
sunguangming
2025-11-10 00:59:30 +00:00
parent 81470bfd5a
commit ee5e1c8bfe
5 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/config/table.php
+1
View File
@@ -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;
module/stage/config/form.php
+6 -12
View File
@@ -1,26 +1,20 @@
<?php
$now = helper::now();
global $app, $config;
$config->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' => '');
module/stage/control.php
+10 -2
View File
@@ -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()));
module/stage/model.php
+3
View File
@@ -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')
module/testcase/config/table.php
+1
View File
@@ -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;