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

* Finish task #40461

Browse Source
This commit is contained in:
zenggang
2021-07-26 16:47:26 +08:00
parent 5c313eef53
commit 12fb7839b7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+4 -4
View File
@@ -442,7 +442,7 @@ class executionModel extends model
$oldExecution = $this->dao->findById($executionID)->from(TABLE_EXECUTION)->fetch();
/* Judgment of required items. */
if($this->post->code == '')
if($oldExecution->type != 'stage' and $this->post->code == '')
{
dao::$errors['code'] = sprintf($this->lang->error->notempty, $this->lang->execution->code);
return false;
@@ -502,7 +502,7 @@ class executionModel extends model
->checkIF($execution->begin != '', 'begin', 'date')
->checkIF($execution->end != '', 'end', 'date')
->checkIF($execution->end != '', 'end', 'gt', $execution->begin)
->check('code', 'unique', "id!=$executionID and deleted='0'")
->check('code', 'unique', "id!=$executionID and code!='' and deleted='0'")
->where('id')->eq($executionID)
->limit(1)
->exec();
@@ -609,11 +609,11 @@ class executionModel extends model
$nameList[$executionName] = $executionName;
/* Check unique code for edited executions. */
if(empty($executionCode))
if($projectModel == 'scrum' and empty($executionCode))
{
dao::$errors['code'][] = 'execution#' . $executionID . sprintf($this->lang->error->notempty, $this->lang->project->code);
}
else
elseif(!empty($executionCode))
{
/* Check unique code for edited executions. */
if(isset($codeList[$executionCode])) dao::$errors['code'][] = 'execution#' . $executionID . sprintf($this->lang->error->unique, $this->lang->project->code, $executionCode);