From 28a3491819f8d7d8914c1dcdf6e86321021363b7 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Mon, 5 Sep 2022 11:03:18 +0800
Subject: [PATCH 1/4] * Fix bug #26994.

---
 module/story/model.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/story/model.php b/module/story/model.php
index 8063336021..87de11e749 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -1976,7 +1976,8 @@ class storyModel extends model
                 {
                     if(!empty($oldStory->plan) and isset($branchPlanPairs[$plan->branch]) and $branchPlanPairs[$plan->branch] != $planID) $unlinkPlans[$branchPlanPairs[$plan->branch]] = empty($unlinkPlans[$branchPlanPairs[$plan->branch]]) ? $storyID : "{$unlinkPlans[$branchPlanPairs[$plan->branch]]},$storyID";
                     if(isset($branchPlanPairs[$plan->branch])) $branchPlanPairs[$plan->branch] = $planID;
-                    $story->plan = $oldStory->plan ? ',' . implode(',', $branchPlanPairs) : ",$planID";
+                    $story->plan = $oldStory->plan ? ',' . implode(',', $branchPlanPairs) : $planID;
+                    $story->plan = trim($story->plan, ',');
                     if($story->plan != $oldStory->plan and !empty($planID)) $link2Plans[$planID]  = empty($link2Plans[$planID]) ? $storyID : "{$link2Plans[$planID]},$storyID";
                 }
             }

From 9ef6b56e2c91282b7b79c4f9d29aa53c867dcc3e Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Mon, 5 Sep 2022 13:07:33 +0800
Subject: [PATCH 2/4] * Fix bug #26994.

---
 module/productplan/model.php | 3 ++-
 module/story/model.php       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/productplan/model.php b/module/productplan/model.php
index 54ff91e7b5..385ee5f43a 100644
--- a/module/productplan/model.php
+++ b/module/productplan/model.php
@@ -930,7 +930,8 @@ class productplanModel extends model
                     ->fetchPairs();
                 if(isset($branchPlanPairs[$plan->branch])) $branchPlanPairs[$plan->branch] = $planID;
 
-                $plansOfStory = ',' . implode(',', $branchPlanPairs);
+                $plansOfStory = implode(',', $branchPlanPairs);
+                $plansOfStory = trim($plansOfStory, ',');
 
                 $this->dao->update(TABLE_STORY)->set("plan")->eq($plansOfStory)->where('id')->eq((int)$storyID)->exec();
 
diff --git a/module/story/model.php b/module/story/model.php
index 87de11e749..15f992cde2 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -1976,7 +1976,7 @@ class storyModel extends model
                 {
                     if(!empty($oldStory->plan) and isset($branchPlanPairs[$plan->branch]) and $branchPlanPairs[$plan->branch] != $planID) $unlinkPlans[$branchPlanPairs[$plan->branch]] = empty($unlinkPlans[$branchPlanPairs[$plan->branch]]) ? $storyID : "{$unlinkPlans[$branchPlanPairs[$plan->branch]]},$storyID";
                     if(isset($branchPlanPairs[$plan->branch])) $branchPlanPairs[$plan->branch] = $planID;
-                    $story->plan = $oldStory->plan ? ',' . implode(',', $branchPlanPairs) : $planID;
+                    $story->plan = $oldStory->plan ? implode(',', $branchPlanPairs) : $planID;
                     $story->plan = trim($story->plan, ',');
                     if($story->plan != $oldStory->plan and !empty($planID)) $link2Plans[$planID]  = empty($link2Plans[$planID]) ? $storyID : "{$link2Plans[$planID]},$storyID";
                 }

From dd1feb1a04ac96d79d54a07cf9f417f07b79c72b Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Mon, 5 Sep 2022 13:25:01 +0800
Subject: [PATCH 3/4] * Fix bug #24894.

---
 module/block/view/todoblock.html.php | 49 +++++++++++++++-------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/module/block/view/todoblock.html.php b/module/block/view/todoblock.html.php
index 81b1c76209..9dd50fb922 100644
--- a/module/block/view/todoblock.html.php
+++ b/module/block/view/todoblock.html.php
@@ -37,6 +37,7 @@ if(!$selfCall) die(include('./todolist.html.php'));
 .block-todoes .todo-flexbetween {display: flex; justify-content: space-between;}
 .block-todoes #todoList {display: flex; overflow: hidden;}
 .block-todoes .label-todo {width: 50px; min-width: 50px!important; border: none; color: #43A047;}
+.block-todoes .todo-title.text-ellipsis {text-overflow: unset;}
 [lang^='en'] .block-todoes .todo-pri {width: 60px; min-width: 60px;}
 </style>
 <div class='block-todoes'>
@@ -93,29 +94,31 @@ if(!$selfCall) die(include('./todolist.html.php'));
         </div>
       </form>
     </div>
-    <ul class="todoes">
-      <?php foreach($todos as $id => $todo):?>
-      <?php
-      $appid = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : '';
-      $viewLink = $this->createLink('todo', 'view', "todoID={$todo->id}&from=my", 'html', true);
-      ?>
-      <li data-id='<?php echo $todo->id?>' class='titleBox'>
-        <span class="todo-check icon icon-check-circle"></span>
-        <a href="<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink);?>" class='iframe todo-flexbetween' data-width='1000px' data-toggle='modal' <?php echo $appid?>>
-          <div id='todoList'>
-            <?php if ($todo->date == '2030-01-01') :?>
-            <div class="todo-time"><?php echo $lang->todo->periods['future'] ?></div>
-            <?php else:?>
-            <div class="todo-time"><?php echo date(DT_DATE4, strtotime($todo->date)) . ' ' . $todo->begin;?></div>
-            <?php endif;?>
-            <div class="todo-pri label-pri label-pri-<?php echo $todo->pri?>" title="<?php echo zget($lang->todo->priList, $todo->pri);?>"><?php echo zget($lang->todo->priList, $todo->pri);?></div>
-            <div class="todo-title text-ellipsis" title='<?php echo $todo->name;?>'><?php echo $todo->name;?></div>
-          </div>
-          <span class="label label-id label-todo hidden"><?php echo $lang->block->done;?></span>
-        </a>
-      </li>
-      <?php endforeach;?>
-    </ul>
+    <div class='table-row'>
+      <ul class="todoes">
+        <?php foreach($todos as $id => $todo):?>
+        <?php
+        $appid = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : '';
+        $viewLink = $this->createLink('todo', 'view', "todoID={$todo->id}&from=my", 'html', true);
+        ?>
+        <li data-id='<?php echo $todo->id?>' class='titleBox'>
+          <span class="todo-check icon icon-check-circle"></span>
+          <a href="<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink);?>" class='iframe todo-flexbetween' data-width='1000px' data-toggle='modal' <?php echo $appid?>>
+            <div id='todoList'>
+              <?php if ($todo->date == '2030-01-01') :?>
+              <div class="todo-time"><?php echo $lang->todo->periods['future'] ?></div>
+              <?php else:?>
+              <div class="todo-time"><?php echo date(DT_DATE4, strtotime($todo->date)) . ' ' . $todo->begin;?></div>
+              <?php endif;?>
+              <div class="todo-pri label-pri label-pri-<?php echo $todo->pri?>" title="<?php echo zget($lang->todo->priList, $todo->pri);?>"><?php echo zget($lang->todo->priList, $todo->pri);?></div>
+              <div class="todo-title text-ellipsis" title='<?php echo $todo->name;?>'><?php echo $todo->name;?></div>
+            </div>
+            <span class="label label-id label-todo hidden"><?php echo $lang->block->done;?></span>
+          </a>
+        </li>
+        <?php endforeach;?>
+      </ul>
+    </div>
   </div>
   <script>
   $(function()

From 1078a4ebc9ae941c9ad4e660c2f43e10f8d190b6 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Mon, 5 Sep 2022 14:21:35 +0800
Subject: [PATCH 4/4] * Fix bug #24830.

---
 module/tree/js/browse.js         | 2 --
 module/tree/view/browse.html.php | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/tree/js/browse.js b/module/tree/js/browse.js
index 8e2576af23..4b2a9692a0 100644
--- a/module/tree/js/browse.js
+++ b/module/tree/js/browse.js
@@ -76,6 +76,4 @@ $(document).ready(function()
 {
     toggleCopy(false);
     $('[data-id="edit"] a').modalTrigger({type: 'iframe', width: 500});
-
-    parent.$('#triggerModal .modal-content .modal-header .close').on('click', function(){parent.location.reload();});
 });
diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php
index b6582f2936..e8f31d3eed 100644
--- a/module/tree/view/browse.html.php
+++ b/module/tree/view/browse.html.php
@@ -335,6 +335,8 @@ $(function()
     if(window.config.viewType == 'line') $('#modulemenu > .nav > li > a[href*=product][href*=all]').parent('li[data-id=all]').addClass('active');
     if(viewType == 'case' || viewType == 'caselib') $('#subNavbar li[data-id="' + viewType +'"]').addClass('active');
 });
+
+if("<?php $from == 'doc'?>") parent.$('#triggerModal .modal-content .modal-header .close').on('click', function(){parent.location.reload();});
 </script>
 <style>
 .module-name {display: inline-block; max-width: calc(100% - 85px); white-space: nowrap; overflow: hidden; text-overflow: ellipsis;}