From 9e1f09d37a8506fb0ca6c070fdf1a526463a3706 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Tue, 26 Apr 2022 03:25:12 +0000
Subject: [PATCH 1/2] * Fix bug#21982,21983

---
 module/doc/control.php | 2 +-
 module/repo/model.php  | 2 +-
 module/task/model.php  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/doc/control.php b/module/doc/control.php
index 07028eae44..e4dd5e20ba 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -590,7 +590,7 @@ class doc extends control
 
                     if($from == 'lib')
                     {
-                        $response['locate'] = $this->createLink('doc', 'objectLibs', "type=$objectType");
+                        $response['locate'] = $this->createLink('doc', 'objectLibs', "type=$objectType&objectID=0&libID={$doc->lib}");
                     }
                 }
                 return $this->send($response);
diff --git a/module/repo/model.php b/module/repo/model.php
index 2a54926e2e..9575a12c48 100644
--- a/module/repo/model.php
+++ b/module/repo/model.php
@@ -1657,7 +1657,7 @@ class repoModel extends model
                         $this->post->set('realStarted', date('Y-m-d'));
                         $this->post->set('currentConsumed', $this->post->consumed);
                         $this->post->set('consumed', $this->post->consumed + $task->consumed);
-                        $changes = $this->task->finish($taskID);
+                        $changes = $this->task->finish($taskID, 'DEVOPS');
                         foreach($this->createActionChanges($log, $repoRoot, $scm) as $change) $changes[] = $change;
                         if($changes)
                         {
diff --git a/module/task/model.php b/module/task/model.php
index 3242900dd1..b2e9738488 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1709,7 +1709,7 @@ class taskModel extends model
         $now     = helper::now();
         $today   = helper::today();
 
-        if(strpos($this->config->task->finish->requiredFields, 'comment') !== false and !$this->post->comment)
+        if($extra != 'DEVOPS' and strpos($this->config->task->finish->requiredFields, 'comment') !== false and !$this->post->comment)
         {
             dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->comment);
             return false;

From 7688d211d32cbda2898e41d2deb21f56482f7fe5 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Tue, 26 Apr 2022 06:21:15 +0000
Subject: [PATCH 2/2] * Fix bug#21981

---
 module/programplan/lang/en.php    | 1 +
 module/programplan/lang/zh-cn.php | 1 +
 module/programplan/model.php      | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/module/programplan/lang/en.php b/module/programplan/lang/en.php
index ddd4931d7f..e9ef5a18f4 100644
--- a/module/programplan/lang/en.php
+++ b/module/programplan/lang/en.php
@@ -79,3 +79,4 @@ $lang->programplan->error->planFinishSmall = 'The "End" date must be > the "Begi
 $lang->programplan->error->percentOver     = 'The sum of "Workload %" cannot exceed 100%.';
 $lang->programplan->error->createdTask     = 'The task is decomposed. Sub stages cannot be added.';
 $lang->programplan->error->parentWorkload  = 'The sum of the workload in the sub stage cannot be > that in the parent stage: %s.';
+$lang->programplan->error->sameName        = 'Stage name cannot be the same!';
diff --git a/module/programplan/lang/zh-cn.php b/module/programplan/lang/zh-cn.php
index c67b97931a..494b212d51 100644
--- a/module/programplan/lang/zh-cn.php
+++ b/module/programplan/lang/zh-cn.php
@@ -80,3 +80,4 @@ $lang->programplan->error->percentOver     = '工作量占比累计不应当超
 $lang->programplan->error->createdTask     = '已分解任务,不可添加子阶段';
 $lang->programplan->error->parentWorkload  = '子阶段的工作量之和不能大于父阶段的工作量:%s';
 $lang->programplan->error->parentDuration  = '子阶段计划开始、计划完成不能超过父阶段';
+$lang->programplan->error->sameName        = '阶段名称不能相同！';
diff --git a/module/programplan/model.php b/module/programplan/model.php
index 3fefb2d7c9..3f522166b4 100644
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -433,6 +433,9 @@ class programplanModel extends model
             $parentACL       = $parentStage->acl;
         }
 
+        $names = array_filter($names);
+        if(count(array_unique($names)) != count($names)) return dao::$errors['message'][] = $this->lang->programplan->error->sameName;
+
         $datas = array();
         foreach($names as $key => $name)
         {