From 4809e3d1ea95e494e218ddf4c7b403973163e7b6 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 19 Nov 2018 14:43:49 +0800
Subject: [PATCH]  * adjust code.

---
 module/common/view/pastetext.html.php | 2 +-
 module/project/view/bug.html.php      | 2 +-
 module/story/model.php                | 2 +-
 module/task/model.php                 | 1 +
 module/testsuite/config.php           | 4 ++--
 module/tree/view/edit.html.php        | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/module/common/view/pastetext.html.php b/module/common/view/pastetext.html.php
index 70bf23ecb4..8a34f24345 100644
--- a/module/common/view/pastetext.html.php
+++ b/module/common/view/pastetext.html.php
@@ -28,7 +28,7 @@ $(function()
         var lastIndex = parseInt($formTbody.find('tr:last > td:first').text());
         var $newRow = $(rowTpl.replace(/%s/g, lastIndex + 1));
         $newRow.find('.chosen').chosen();
-        $newRow.find('.iframe').modalTrigger({iframe:true});;
+        $newRow.find('.iframe').modalTrigger({iframe:true});
         $newRow.find('[data-provide="colorpicker-later"]').colorPicker();
         $newRow.datepickerAll();
         $formTbody.append($newRow);
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
index 9b8e1df398..b6f6923ced 100644
--- a/module/project/view/bug.html.php
+++ b/module/project/view/bug.html.php
@@ -117,7 +117,7 @@
         <div class="btn-group dropup">
           <button data-toggle="dropdown" type="button" class="btn"><?php echo $lang->bug->assignedTo?> <span class="caret"></span></button>
           <?php
-          $withSearch = count($memberPairs) > 1;
+          $withSearch = count($memberPairs) > 10;
           $actionLink = $this->createLink('bug', 'batchAssignTo', "projectID={$project->id}&type=project");
 
           if($withSearch)
diff --git a/module/story/model.php b/module/story/model.php
index c486442d5d..9d9819d1e6 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -1939,7 +1939,7 @@ class storyModel extends model
             {
                 $property = '(' . $this->lang->story->pri . ':' . (!empty($this->lang->story->priList[$story->pri]) ? $this->lang->story->priList[$story->pri] : 0) . ',' . $this->lang->story->estimate . ':' . $story->estimate . ')';
             }
-            $storyPairs[$story->id] = $story->id . ':' . $story->title . ' '. $property;
+            $storyPairs[$story->id] = $story->id . ':' . $story->title . ' ' . $property;
 
             if($limit > 0 && ++$i > $limit)
             {
diff --git a/module/task/model.php b/module/task/model.php
index f80d6c3189..1156844a8d 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -688,6 +688,7 @@ class taskModel extends model
             {
                 $this->dao->update(TABLE_TASK)->set('parent')->eq(-1)->where('id')->eq($task->parent)->exec();
                 $this->updateParentStatus($taskID);
+                $this->computeBeginAndEnd($task->parent);
             }
             $this->file->updateObjectID($this->post->uid, $taskID, 'task');
             return common::createChanges($oldTask, $task);
diff --git a/module/testsuite/config.php b/module/testsuite/config.php
index 2c7f23bba7..4e325d3cf8 100644
--- a/module/testsuite/config.php
+++ b/module/testsuite/config.php
@@ -18,5 +18,5 @@ $config->testsuite->datatable = new stdclass();
 $config->testsuite->datatable->defaultField = array('id', 'pri', 'title', 'type', 'assignedTo', 'lastRunner', 'lastRunDate', 'lastRunResult', 'status', 'bugs', 'results', 'actions');
 
 $config->testsuite->custom = new stdclass();
-$config->testsuite->custom->createFields      = 'stage,pri,keywords';
-$config->testsuite->customCreateFields        = 'stage,pri,keywords';
+$config->testsuite->custom->createFields = 'stage,pri,keywords';
+$config->testsuite->customCreateFields   = 'stage,pri,keywords';
diff --git a/module/tree/view/edit.html.php b/module/tree/view/edit.html.php
index eb4f9d6e18..38de14660c 100644
--- a/module/tree/view/edit.html.php
+++ b/module/tree/view/edit.html.php
@@ -105,4 +105,4 @@ function loadDocModule(libID)
     })  
 }
 $(function(){$('.chosen').chosen();})
-    </script>
+</script>