From b9162912938ca54c1ae92cd6572e9fd218c69dbd Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Mon, 21 Jun 2021 14:14:48 +0800
Subject: [PATCH 1/8] * Fix code error.

---
 module/project/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/project/model.php b/module/project/model.php
index c960f1aacd..dbe77c40fc 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -768,7 +768,7 @@ class projectModel extends model
                 $product->name           = $this->post->productName ? $this->post->productName : $project->name;
                 $product->bind           = $this->post->parent ? 0 : 1;
                 $product->program        = $project->parent ? current(array_filter(explode(',', $program->path))) : 0;
-                $product->acl            = $project->acl = 'open' ? 'open' : 'private';
+                $product->acl            = $project->acl == 'open' ? 'open' : 'private';
                 $product->PO             = $project->PM;
                 $product->createdBy      = $this->app->user->account;
                 $product->createdDate    = helper::now();

From b08c1e4fd57b2955c085fa1d63bcf3dbb2387b11 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Mon, 21 Jun 2021 14:28:29 +0800
Subject: [PATCH 2/8] * Finish task #38710.

---
 www/theme/default/style.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index e32309b018..7342084ebc 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -42,6 +42,7 @@ a.showMoreImage:hover {opacity: 1;}
 .chosen-container .chosen-drop{z-index: 1100;}
 
 .table-actions .btn {background: #78bdf5; color: #fff; border-color: #78bdf5}
+.table-actions > .btn-group:first-child > .btn:first-child {border-right: 1px solid #fff}
 .table-footer .checked+div .btn, .table-actions .btn:hover {background: #16a8f8; border-color: #16a8f8}
 
 #header #toolbar a {color: #3c4353; font-size: 13px; position: relative;}

From 61b24395934ea2598b57fa4ac005d2853a89e5ad Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Mon, 21 Jun 2021 14:30:54 +0800
Subject: [PATCH 3/8] * Fix bug 13268.

---
 module/task/view/edit.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index b750893a97..e1931015f9 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -210,7 +210,7 @@
               </tr>
               <tr>
                 <th><?php echo $lang->task->realStarted;?></th>
-                <td><?php echo html::input('realStarted', $task->realStarted, "class='form-control form-datetime'");?></td>
+                <td><?php echo html::input('realStarted', helper::isZeroDate($task->realStarted) ? helper::now() : $task->realStarted, "class='form-control form-datetime'");?></td>
               </tr>
               <tr>
                 <th><?php echo $lang->task->finishedBy;?></th>

From 2323481feb2c1269dd1db63bf5820d3ef5cfcdc8 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Mon, 21 Jun 2021 14:32:44 +0800
Subject: [PATCH 4/8] * Fix bug #13263.

---
 module/bug/view/edit.html.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index f5b6844452..3976f1f790 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -258,25 +258,26 @@ js::set('systemMode'             , $config->systemMode);
                   <th class='thWidth'><?php echo $lang->bug->linkBug;?></th>
                   <td><?php echo html::a($this->createLink('bug', 'linkBugs', "bugID=$bug->id", '', true), $lang->bug->linkBugs, '', "class='text-primary' data-toggle='modal' data-type='iframe' data-width='95%'");?></td>
                 </tr>
-                <?php if(isset($bug->linkBugTitles)):?>
                 <tr>
                   <th></th>
                   <td>
                     <ul class='list-unstyled'>
                       <?php
-                      foreach($bug->linkBugTitles as $linkBugID => $linkBugTitle)
+                      if(isset($bug->linkBugTitles))
                       {
-                          echo "<li><div class='checkbox-primary'>";
-                          echo "<input type='checkbox' checked='checked' name='linkBug[]' value=$linkBugID />";
-                          echo "<label>#{$linkBugID} {$linkBugTitle}</label>";
-                          echo '</div></li>';
+                          foreach($bug->linkBugTitles as $linkBugID => $linkBugTitle)
+                          {
+                              echo "<li><div class='checkbox-primary'>";
+                              echo "<input type='checkbox' checked='checked' name='linkBug[]' value=$linkBugID />";
+                              echo "<label>#{$linkBugID} {$linkBugTitle}</label>";
+                              echo '</div></li>';
+                          }
                       }
                       ?>
                       <span id='linkBugsBox'></span>
                     </ul>
                   </td>
                 </tr>
-                <?php endif;?>
                 <tr>
                   <th><?php echo $lang->bug->testtask;?></th>
                   <td id='testtaskBox'><?php echo html::select('testtask', $testtasks, $bug->testtask, 'class="form-control chosen"');?></td>

From 2366219f2aa806c054510d74d6587db807187f9c Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Mon, 21 Jun 2021 14:37:19 +0800
Subject: [PATCH 5/8] * Fix error for story link requirement.

---
 module/story/control.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/module/story/control.php b/module/story/control.php
index 0d13439ef8..df9aab2deb 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -1610,6 +1610,16 @@ class story extends control
         $products = $this->product->getPairs();
         $queryID  = 0;
 
+        /* Change for requirement story title. */
+        if($story->type == 'story')
+        {    
+            $this->lang->story->title  = str_replace($this->lang->SRCommon, $this->lang->URCommon, $this->lang->story->title);
+            $this->lang->story->create = str_replace($this->lang->SRCommon, $this->lang->URCommon, $this->lang->story->create);
+            $this->config->product->search['fields']['title'] = $this->lang->story->title;
+            unset($this->config->product->search['fields']['plan']);
+            unset($this->config->product->search['fields']['stage']);
+        }
+
         /* Build search form. */
         $actionURL = $this->createLink('story', 'linkStory', "storyID=$storyID&type=$type&linkedStoryID=$linkedStoryID&browseType=bySearch&queryID=myQueryID", '', true);
         $this->product->buildSearchForm($story->product, $products, $queryID, $actionURL);

From 2e0f114c2f65c465f6aab256556932ef4ab8070e Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Mon, 21 Jun 2021 14:40:35 +0800
Subject: [PATCH 6/8] * Remove unused field.

---
 module/story/view/view.html.php | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 689a8502e2..13bf65c206 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -501,34 +501,6 @@
                     </ul>
                   </td>
                 </tr>
-                <tr>
-                  <th class='thWidth'><?php echo $lang->story->legendLinkStories;?></th>
-                  <td class='pd-0'>
-                    <ul class='list-unstyled'>
-                      <?php
-                      $linkStories = explode(',', $story->linkStories) ;
-                      foreach($linkStories as $linkStoryID)
-                      {
-                          if(isset($story->extraStories[$linkStoryID])) echo '<li>' . html::a($this->createLink('story', 'view', "storyID=$linkStoryID", '', true), "[S] #$linkStoryID " . $story->extraStories[$linkStoryID], '', "class='iframe' data-width='80%'") . '</li>';
-                      }
-                      ?>
-                    </ul>
-                  </td>
-                </tr>
-                <tr>
-                  <th><?php echo $lang->story->legendChildStories;?></th>
-                  <td class='pd-0'>
-                    <ul class='list-unstyled'>
-                      <?php
-                      $childStories = explode(',', $story->childStories) ;
-                      foreach($childStories as $childStoryID)
-                      {
-                        if(isset($story->extraStories[$childStoryID])) echo '<li>' . html::a($this->createLink('story', 'view', "storyID=$childStoryID", '', true), "#$childStoryID " . $story->extraStories[$childStoryID], '', "class='iframe' data-width='80%'") . '</li>';
-                      }
-                      ?>
-                    </ul>
-                  </td>
-                </tr>
               </tbody>
             </table>
           </div>

From 1d6ffcd6b4506138e93ff8e8a98b40cb23dd22c2 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Mon, 21 Jun 2021 14:49:16 +0800
Subject: [PATCH 7/8] * Fix bug #13170.

---
 module/story/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/story/control.php b/module/story/control.php
index 0d13439ef8..1337a10333 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -2011,7 +2011,7 @@ class story extends control
                     }
                     $story->plan = $plans;
                 }
-                if(isset($relatedStories[$story->duplicateStory])) $story->duplicateStory = $relatedStories[$story->duplicateStory];
+                if(isset($relatedStories[$story->duplicateStory]) and $story->closedReason != 'duplicate') $story->duplicateStory = $relatedStories[$story->duplicateStory];
 
                 if(isset($storyLang->priList[$story->pri]))             $story->pri          = $storyLang->priList[$story->pri];
                 if(isset($storyLang->statusList[$story->status]))       $story->status       = $this->processStatus('story', $story);

From b6b31de401ee55c36c9f50b51a253e5f1ba28ede Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Mon, 21 Jun 2021 14:50:35 +0800
Subject: [PATCH 8/8] * Finish task #38715.

---
 module/task/view/create.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index 508f3f7087..6e3d083976 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -236,7 +236,7 @@
           <td colspan='3'>
             <div class="input-group">
               <?php echo html::select('mailto[]', $execution->acl == 'private' ? $members : $users, str_replace(' ', '', $task->mailto), "class='form-control chosen' data-placeholder='{$lang->chooseUsersToMail}' multiple");?>
-              <?php echo $this->fetch('my', 'buildContactLists');?>
+              <?php if($execution->acl != 'private') echo $this->fetch('my', 'buildContactLists');?>
             </div>
           </td>
         </tr>