From c9046ede6df7e90061d7c7aa8b7457143aa387ab Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Wed, 20 Jan 2021 08:20:25 +0800
Subject: [PATCH] * Finish task #8988.

---
 module/programplan/model.php  | 3 ++-
 module/project/lang/zh-cn.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/programplan/model.php b/module/programplan/model.php
index d02e830b11..5d7b7ff75f 100644
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -896,10 +896,11 @@ class programplanModel extends model
         /* Remove the currently edited stage. */
         if(isset($parentStage[$planID])) unset($parentStage[$planID]);
 
+        $plan = $this->getByID($planID);
         foreach($parentStage as $key => $stage)
         {
             $isCreate = $this->isCreateTask($key);
-            if($isCreate === false) unset($parentStage[$key]);
+            if($isCreate === false and $key != $plan->parent) unset($parentStage[$key]);
         }
         $parentStage[0] = $this->lang->programplan->emptyParent;
         ksort($parentStage);
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index b364a873d2..26cde920ab 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -265,7 +265,7 @@ $lang->project->byPeriod            = '按时间段';
 $lang->project->byUser              = '按用户';
 $lang->project->noProject           = "暂时没有{$lang->executionCommon}。";
 $lang->project->noMembers           = '暂时没有团队成员。';
-$lang->project->workloadTotal       = "工作量占比累计不应当超过100%, 当前产品下的工作量之和为:%s";
+$lang->project->workloadTotal       = "工作量占比累计不应当超过100, 当前产品下的工作量之和为%s";
 $lang->project->linkPRJStoryTip     = "(关联{$lang->SRCommon}来源于项目下所关联的{$lang->SRCommon})";
 $lang->project->linkAllStoryTip     = "(项目下还未关联{$lang->SRCommon}，可直接关联该迭代/阶段/冲刺所关联产品的{$lang->SRCommon})";