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

* Finish task#40899.

Browse Source
This commit is contained in:
leiyong
2021-08-05 14:34:50 +08:00
parent 79508d4e3b
commit df5d8e384d
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/custom/config.php
+1 -1
View File
@@ -53,7 +53,7 @@ $config->custom->fieldList['task']['edit'] = 'pri,estimate,estStarted,
$config->custom->fieldList['task']['finish'] = 'comment';
$config->custom->fieldList['task']['activate'] = 'assignedTo,comment';
$config->custom->fieldList['build'] = 'scmPath,filePath,desc';
$config->custom->fieldList['bug']['create'] = 'module,project,deadline,type,os,browser,severity,pri,steps,keywords';
$config->custom->fieldList['bug']['create'] = 'module,deadline,type,os,browser,severity,pri,steps,keywords';
$config->custom->fieldList['bug']['edit'] = 'plan,assignedTo,deadline,type,os,browser,severity,pri,steps,keywords';
$config->custom->fieldList['bug']['resolve'] = 'resolvedBuild,resolvedDate,assignedTo,comment';
$config->custom->fieldList['testcase']['create'] = 'stage,story,pri,precondition,keywords';
module/upgrade/model.php
+25
View File
@@ -688,6 +688,11 @@ class upgradeModel extends model
$this->saveLogs('Execute 15_0_3');
$this->execSQL($this->getUpgradeFile('15.0.3'));
$this->appendExec('15_0_3');
case '15_3':
$this->saveLogs('Execute 15_3');
$this->execSQL($this->getUpgradeFile('15.3'));
$this->adjustBugRequired();
$this->appendExec('15_3');
}
$this->deletePatch();
@@ -5141,4 +5146,24 @@ class upgradeModel extends model
$this->loadModel("gitlab")->initWebhooks($products, $gitlabID, $gitlabProject);
}
}
/**
* Required to adjust the bug.
*
* @access public
* @return void
*/
public function adjustBugRequired()
{
$data = $this->dao->select('*')->from(TABLE_CONFIG)
->where('owner')->eq('system')
->andWhere('module')->eq('bug')
->andWhere('section')->eq('create')
->andWhere('`key`')->eq('requiredFields')
->fetch();
$data->value = ',' . $data->value . ',';
$data->value = str_replace(',project,', ',', $data->value);
$this->dao->update(TABLE_CONFIG)->set('value')->eq(trim($data->value, ','))->where('id')->eq($data->id)->exec();
}
}