From a8fb159310c730e22b9eda8df1913e861ffe684d Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 29 Nov 2017 14:47:40 +0800
Subject: [PATCH 01/40]  * fix error.

---
 db/zentao.sql               | 2 +-
 module/build/control.php    | 2 +-
 module/project/model.php    | 2 +-
 module/testcase/control.php | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/db/zentao.sql b/db/zentao.sql
index c2eb4e5475..affac107d4 100644
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -914,7 +914,7 @@ INSERT INTO `zt_group` (`id`, `name`, `role`, `desc`) VALUES
 (7, 'PD', 'pd', 'for product director.'),
 (8, 'QD', 'qd', 'for quality director.'),
 (9, 'TOP', 'top', 'for top manager.'),
-(10, 'OTHERS', '', 'for others.'),
+(10, 'OTHERS', 'others', 'for others.'),
 (11, 'guest', 'guest', 'For guest'),
 (12, 'limited', 'limited', 'For limited user');
 
diff --git a/module/build/control.php b/module/build/control.php
index c8a5bd1fed..6fe1f9d488 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -346,7 +346,7 @@ class build extends control
         }
         if($varName == 'testTaskBuild')
         {
-            $builds = $this->build->getProjectBuildPairs($projectID, $productID, $branch, 'noempty');
+            $builds = $this->build->getProjectBuildPairs($projectID, $productID, $branch, 'noempty,notrunk');
             if($isJsonView) die(json_encode($builds));
             else die(html::select('build', $builds, $build, "class='form-control'"));
         }
diff --git a/module/project/model.php b/module/project/model.php
index 7b8017f62e..1b6c04c68e 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -342,7 +342,7 @@ class projectModel extends model
                     $member->role    = $this->lang->project->$fieldName;
                     $member->days    = $project->days;
                     $member->hours   = $this->config->project->defaultWorkhours;
-                    $this->dao->insert(TABLE_TEAM)->data($member)->exec();
+                    $this->dao->replace(TABLE_TEAM)->data($member)->exec();
                 }
             }
         }
diff --git a/module/testcase/control.php b/module/testcase/control.php
index de54fe507d..917eae5fa7 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -1147,10 +1147,10 @@ class testcase extends control
                 }
 
                 /* fill some field with useful value. */
-                if(isset($products[$case->product]))      $case->product = $products[$case->product] . "(#$case->product)";
-                if(isset($branches[$case->branch]))       $case->branch  = $branches[$case->branch] . "(#$case->branch)";
-                if(isset($relatedModules[$case->module])) $case->module  = $relatedModules[$case->module] . "(#$case->module)";
-                if(isset($relatedStories[$case->story]))  $case->story   = $relatedStories[$case->story] . "(#$case->story)";
+                $case->product = !isset($products[$case->product])     ? '' : $products[$case->product] . "(#$case->product)";
+                $case->branch  = !isset($branches[$case->branch])      ? '' : $branches[$case->branch] . "(#$case->branch)";
+                $case->module  = !isset($relatedModules[$case->module])? '' : $relatedModules[$case->module] . "(#$case->module)";
+                $case->story   = !isset($relatedStories[$case->story]) ? '' : $relatedStories[$case->story] . "(#$case->story)";
 
                 if(isset($caseLang->priList[$case->pri]))              $case->pri           = $caseLang->priList[$case->pri];
                 if(isset($caseLang->typeList[$case->type]))            $case->type          = $caseLang->typeList[$case->type];

From 7b0571d18fad39dd192751e2eef46b0d02a279bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <memory@lvtao.net>
Date: Wed, 29 Nov 2017 15:52:14 +0800
Subject: [PATCH 02/40] * User list add title

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

diff --git a/module/company/view/browse.html.php b/module/company/view/browse.html.php
index 04d2cf8649..c5ad8c36b3 100644
--- a/module/company/view/browse.html.php
+++ b/module/company/view/browse.html.php
@@ -65,7 +65,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
           printf('%03d', $user->id);
           ?>
         </td>
-        <td><?php if(!common::printLink('user', 'view', "account=$user->account", $user->realname)) echo $user->realname;?></td>
+        <td><?php if(!common::printLink('user', 'view', "account=$user->account", $user->realname, '', "title='$user->realname'")) echo $user->realname;?></td>
         <td><?php echo $user->account;?></td>
         <td><?php echo $lang->user->roleList[$user->role];?></td>
         <td><?php echo html::mailto($user->email);?></td>

From 759b3950cbe6e775559530666c4781a901b04e0d Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 30 Nov 2017 09:03:40 +0800
Subject: [PATCH 03/40]  * fix bug #1081.

---
 module/testreport/view/blockbugs.html.php       | 3 ++-
 module/testreport/view/blockbuilds.html.php     | 3 ++-
 module/testreport/view/blockcases.html.php      | 3 ++-
 module/testreport/view/blocklegacybugs.html.php | 3 ++-
 module/testreport/view/blockstories.html.php    | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/module/testreport/view/blockbugs.html.php b/module/testreport/view/blockbugs.html.php
index 0657f1d489..499ffd9a81 100644
--- a/module/testreport/view/blockbugs.html.php
+++ b/module/testreport/view/blockbugs.html.php
@@ -1,3 +1,4 @@
+<?php $sysURL = $this->session->notHead ? common::getSysURL() : '';?>
 <table class='table' id='bugs'>
   <thead>
     <tr>
@@ -16,7 +17,7 @@
     <tr>
       <td><?php echo $bug->id . html::hidden('bugs[]', $bug->id)?></td>
       <td><span class='pri<?php echo $bug->pri?>'><?php echo zget($lang->bug->priList, $bug->pri);?></span></td>
-      <td class='text-left' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
+      <td class='text-left' title='<?php echo $bug->title?>'><?php echo html::a($sysURL . $this->createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
       <td><?php echo zget($users, $bug->openedBy);?></td>
       <td><?php echo zget($users, $bug->resolvedBy);?></td>
       <td><?php if($bug->resolvedDate != '0000-00-00 00:00:00') echo substr($bug->resolvedDate, 2);?></td>
diff --git a/module/testreport/view/blockbuilds.html.php b/module/testreport/view/blockbuilds.html.php
index 149559ea85..5dff9a2689 100644
--- a/module/testreport/view/blockbuilds.html.php
+++ b/module/testreport/view/blockbuilds.html.php
@@ -1,3 +1,4 @@
+<?php $sysURL = $this->session->notHead ? common::getSysURL() : '';?>
 <table class='table' id='builds'>
   <thead>
     <tr>
@@ -12,7 +13,7 @@
     <?php foreach($builds as $build):?>
     <tr>
       <td><?php echo $build->id . html::hidden('builds[]', $build->id)?></td>
-      <td class='text-left' title='<?php echo $build->name?>'><?php echo html::a($this->createLink('build', 'view', "buildID=$build->id", '', true), $build->name, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
+      <td class='text-left' title='<?php echo $build->name?>'><?php echo html::a($sysURL . $this->createLink('build', 'view', "buildID=$build->id", '', true), $build->name, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
       <td><?php echo zget($users, $build->builder);?></td>
       <td><?php echo $build->date;?></td>
     </tr>
diff --git a/module/testreport/view/blockcases.html.php b/module/testreport/view/blockcases.html.php
index 138962c28d..968f68b911 100644
--- a/module/testreport/view/blockcases.html.php
+++ b/module/testreport/view/blockcases.html.php
@@ -1,3 +1,4 @@
+<?php $sysURL = $this->session->notHead ? common::getSysURL() : '';?>
 <table class='table' id='cases'>
   <thead>
     <tr>
@@ -18,7 +19,7 @@
     <tr>
       <td><?php echo $case->id . html::hidden('cases[]', $case->id)?></td>
       <td><span class='pri<?php echo $case->pri?>'><?php echo zget($lang->testcase->priList, $case->pri);?></span></td>
-      <td class='text-left' title='<?php echo $case->title?>'><?php echo html::a($this->createLink('testcase', 'view', "caseID=$case->id", '', true), $case->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
+      <td class='text-left' title='<?php echo $case->title?>'><?php echo html::a($sysURL . $this->createLink('testcase', 'view', "caseID=$case->id", '', true), $case->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
       <td><?php echo zget($lang->testcase->typeList, $case->type);?></td>
       <td><?php echo zget($users, $case->assignedTo);?></td>
       <td><?php echo zget($users, $case->lastRunner);?></td>
diff --git a/module/testreport/view/blocklegacybugs.html.php b/module/testreport/view/blocklegacybugs.html.php
index d8df6c234c..d80798283d 100644
--- a/module/testreport/view/blocklegacybugs.html.php
+++ b/module/testreport/view/blocklegacybugs.html.php
@@ -1,3 +1,4 @@
+<?php $sysURL = $this->session->notHead ? common::getSysURL() : '';?>
 <table class='table' id='legacyBugs'>
   <thead>
     <tr>
@@ -16,7 +17,7 @@
     <tr>
       <td><?php echo $bug->id?></td>
       <td><span class='pri<?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri);?></span></td>
-      <td class='text-left' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
+      <td class='text-left' title='<?php echo $bug->title?>'><?php echo html::a($sysURL . $this->createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
       <td><?php echo zget($users, $bug->openedBy);?></td>
       <td><?php echo zget($users, $bug->resolvedBy);?></td>
       <td><?php if($bug->resolvedDate != '0000-00-00 00:00:00') echo substr($bug->resolvedDate, 2);?></td>
diff --git a/module/testreport/view/blockstories.html.php b/module/testreport/view/blockstories.html.php
index 367d50069f..531b207fe6 100644
--- a/module/testreport/view/blockstories.html.php
+++ b/module/testreport/view/blockstories.html.php
@@ -1,3 +1,4 @@
+<?php $sysURL = $this->session->notHead ? common::getSysURL() : '';?>
 <table class='table' id='stories'>
   <thead>
     <tr>
@@ -17,7 +18,7 @@
     <tr>
       <td><?php echo $story->id . html::hidden('stories[]', $story->id)?></td>
       <td><span class='pri<?php echo $story->pri?>'><?php echo zget($lang->story->priList, $story->pri);?></span></td>
-      <td class='text-left' title='<?php echo $story->title?>'><?php echo html::a($this->createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
+      <td class='text-left' title='<?php echo $story->title?>'><?php echo html::a($sysURL . $this->createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
       <td><?php echo zget($users, $story->openedBy);?></td>
       <td><?php echo zget($users, $story->assignedTo);?></td>
       <td><?php echo $story->estimate?></td>

From 76ea4b62e54495169d2278ea8d747a315492de68 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 30 Nov 2017 09:25:22 +0800
Subject: [PATCH 04/40]  * fix bug #993.

---
 module/task/model.php | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/module/task/model.php b/module/task/model.php
index bf17871795..257e7da219 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -382,20 +382,7 @@ class taskModel extends model
             }
         }
 
-        if($task->consumed < $oldTask->consumed)
-        {
-            die(js::error($this->lang->task->error->consumedSmall));
-        }
-        elseif($task->consumed != $oldTask->consumed or $task->left != $oldTask->left)
-        {
-            $estimate = new stdClass();
-            $estimate->consumed = $task->consumed - $oldTask->consumed;
-            $estimate->left     = $task->left;
-            $estimate->task     = $taskID;
-            $estimate->account  = $this->app->user->account;
-            $estimate->date     = helper::now();
-            $this->addTaskEstimate($estimate);
-        }
+        if($task->consumed < $oldTask->consumed) die(js::error($this->lang->task->error->consumedSmall));
 
         $task = $this->loadModel('file')->processImgURL($task, $this->config->task->editor->edit['id'], $this->post->uid);
         $this->dao->update(TABLE_TASK)->data($task)

From 5aae8732dd660680bbd8fb81c52375b7c0ae3b6d Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 30 Nov 2017 14:13:25 +0800
Subject: [PATCH 05/40]  * fix bug #843.

---
 module/testcase/view/showimport.html.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php
index 4ad3509c24..ca90cbda7b 100644
--- a/module/testcase/view/showimport.html.php
+++ b/module/testcase/view/showimport.html.php
@@ -6,7 +6,7 @@
 <div class='alert alert-info'><?php echo $suhosinInfo?></div>
 <?php else:?>
 <form target='hiddenwin' method='post' class='form-condensed'>
-  <table class='table table-fixed active-disabled table-custom'>
+  <table class='table table-fixed active-disabled table-custom' id='showData'>
     <thead>
       <tr>
         <th class='w-70px'><?php echo $lang->testcase->id?></th>
@@ -32,7 +32,10 @@
       </tr>
     </thead>
     <tbody>
-      <?php $insert = true;?>
+      <?php
+      $insert = true;
+      $addID  = 1;
+      ?>
       <?php foreach($caseData as $key => $case):?>
       <?php if(empty($case->title)) continue;?>
       <tr valign='top' align='center'>
@@ -45,7 +48,7 @@
           }
           else
           {
-              echo $key . " <sub class='gray' style='vertical-align:sub;'>{$lang->testcase->new}</sub>";
+              echo $addID++ . " <sub class='gray' style='vertical-align:sub;'>{$lang->testcase->new}</sub>";
           }
           echo html::hidden("product[$key]", $productID);
           ?>
@@ -100,7 +103,7 @@
 </form>
 <?php endif;?>
 <script>
-$(function(){affix('thead')})
+$(function(){affix('#showData thead')})
 function affix(obj)
 {
     var fixH = $(obj).offset().top;

From 97725f46b19a930a570172a1b4ffa01f6ece708f Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 30 Nov 2017 17:30:42 +0800
Subject: [PATCH 06/40]  * adjust code for pro.

---
 module/product/control.php            | 2 +-
 module/report/lang/en.php             | 3 ++-
 module/report/lang/zh-cn.php          | 3 ++-
 module/report/model.php               | 6 ++----
 module/report/view/bugassign.html.php | 2 +-
 module/report/view/workload.html.php  | 2 +-
 module/story/model.php                | 7 +++++--
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/module/product/control.php b/module/product/control.php
index 2e4dec0693..eebc2b9f61 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -158,7 +158,7 @@ class product extends control
         $stories = $this->product->getStories($productID, $branch, $browseType, $queryID, $moduleID, $sort, $pager);
 
         /* Process the sql, get the conditon partion, save it to session. */
-        $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'story');
+        $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'story', $browseType != 'bysearch');
 
         /* Get related tasks, bugs, cases count of each story. */
         $storyIdList = array();
diff --git a/module/report/lang/en.php b/module/report/lang/en.php
index 983b0967e5..40a42ab83f 100644
--- a/module/report/lang/en.php
+++ b/module/report/lang/en.php
@@ -16,6 +16,7 @@ $lang->report->item       = 'Item';
 $lang->report->value      = 'Value';
 $lang->report->percent    = '%';
 $lang->report->undefined  = 'Undefined';
+$lang->report->query      = 'Query';
 
 $lang->report->colors[]   = 'AFD8F8';
 $lang->report->colors[]   = 'F6BD0F';
@@ -54,7 +55,7 @@ $lang->report->id            = 'ID';
 $lang->report->project       = $lang->projectCommon;
 $lang->report->product       = $lang->productCommon;
 $lang->report->user          = 'Username';
-$lang->report->bug           = 'Bugs';
+$lang->report->bugTotal      = 'Bugs';
 $lang->report->task          = 'Tasks';
 $lang->report->estimate      = 'Est.';
 $lang->report->consumed      = 'Consumed';
diff --git a/module/report/lang/zh-cn.php b/module/report/lang/zh-cn.php
index e186f47eb3..0965b08343 100644
--- a/module/report/lang/zh-cn.php
+++ b/module/report/lang/zh-cn.php
@@ -16,6 +16,7 @@ $lang->report->item       = '条目';
 $lang->report->value      = '值';
 $lang->report->percent    = '百分比';
 $lang->report->undefined  = '未设定';
+$lang->report->query      = '查询';
 
 $lang->report->colors[]   = 'AFD8F8';
 $lang->report->colors[]   = 'F6BD0F';
@@ -54,7 +55,7 @@ $lang->report->id            = '编号';
 $lang->report->project       = $lang->projectCommon;
 $lang->report->product       = $lang->productCommon;
 $lang->report->user          = '姓名';
-$lang->report->bug           = 'Bug';
+$lang->report->bugTotal      = 'Bug';
 $lang->report->task          = '任务数';
 $lang->report->estimate      = '总预计';
 $lang->report->consumed      = '总消耗';
diff --git a/module/report/model.php b/module/report/model.php
index 170134b31d..a52a888639 100644
--- a/module/report/model.php
+++ b/module/report/model.php
@@ -282,10 +282,8 @@ class reportModel extends model
      */
     public function getBugAssign()
     {
-        $bugs = $this->dao->select('t1.*, t2.name as productName')
-            ->from(TABLE_BUG)->alias('t1')
-            ->leftJoin(TABLE_PRODUCT)->alias('t2')
-            ->on('t1.product = t2.id')
+        $bugs = $this->dao->select('t1.*, t2.name as productName')->from(TABLE_BUG)->alias('t1')
+            ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id')
             ->where('t1.deleted')->eq(0)
             ->andWhere('t1.status')->eq('active')
             ->andWhere('t2.deleted')->eq(0)
diff --git a/module/report/view/bugassign.html.php b/module/report/view/bugassign.html.php
index a362d56122..b4702e57c9 100644
--- a/module/report/view/bugassign.html.php
+++ b/module/report/view/bugassign.html.php
@@ -19,7 +19,7 @@
     <tr class='colhead'>
       <th><?php echo $lang->report->user;?></th>
       <th><?php echo $lang->report->product;?></th>
-      <th><?php echo $lang->report->bug;?></th>
+      <th><?php echo $lang->report->bugTotal;?></th>
       <th><?php echo $lang->report->total;?></th>
     </tr>
     </thead>
diff --git a/module/report/view/workload.html.php b/module/report/view/workload.html.php
index 6938b932e2..0ccbe62360 100644
--- a/module/report/view/workload.html.php
+++ b/module/report/view/workload.html.php
@@ -44,7 +44,7 @@
         </div>
       </div>
       <div class='col-sm-1'>
-        <div class='input-group'><?php echo html::submitButton();?></div>
+        <div class='input-group'><?php echo html::submitButton($lang->report->query);?></div>
       </div>
     </div>
   </form>
diff --git a/module/story/model.php b/module/story/model.php
index 60eaacccc7..a1631efaa2 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -1570,8 +1570,11 @@ class storyModel extends model
             ->beginIF($productID != 'all' and $productID != '')->andWhere('product')->eq((int)$productID)->fi()
             ->fetchPairs();
 
-        $tmpStories = $this->dao->select('*')->from(TABLE_STORY)->where($sql)
-            ->beginIF($productID != 'all' and $productID != '')->andWhere('product')->eq((int)$productID)->fi()
+        $sql = str_replace(array('`product`', '`version`'), array('t1.`product`', 't1.`version`'), $sql);
+        $tmpStories = $this->dao->select('*')->from(TABLE_STORY)->alias('t1')
+            ->leftJoin(TABLE_PROJECTSTORY)->alias('t2')->on('t1.id=t2.story')
+            ->where($sql)
+            ->beginIF($productID != 'all' and $productID != '')->andWhere('t1.`product`')->eq((int)$productID)->fi()
             ->andWhere('deleted')->eq(0)
             ->orderBy($orderBy)
             ->page($pager)

From 08bbbeabfb33ac62ac30c74c6e39d69c100c407e Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 1 Dec 2017 09:06:00 +0800
Subject: [PATCH 07/40]  * fix bug #1303.

---
 module/file/control.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/module/file/control.php b/module/file/control.php
index d84b0b3f5e..6ba97d5fd7 100644
--- a/module/file/control.php
+++ b/module/file/control.php
@@ -339,11 +339,12 @@ class file extends control
         {
             $this->app->loadLang('action');
             $file = $this->file->getByID($fileID);
-            $this->dao->update(TABLE_FILE)->set('title')->eq($this->post->fileName)->where('id')->eq($fileID)->exec();
+            $data = fixer::input('post')->get();
+            $this->dao->update(TABLE_FILE)->set('title')->eq($data->fileName)->where('id')->eq($fileID)->exec();
 
             $extension = "." . $file->extension;
-            $actionID = $this->loadModel('action')->create($file->objectType, $file->objectID, 'editfile', '', $this->post->fileName . $extension);
-            $changes[] = array('field' => 'fileName', 'old' => $file->title . $extension, 'new' => $this->post->fileName . $extension);
+            $actionID = $this->loadModel('action')->create($file->objectType, $file->objectID, 'editfile', '', $data->fileName . $extension);
+            $changes[] = array('field' => 'fileName', 'old' => $file->title . $extension, 'new' => $data->fileName . $extension);
             $this->action->logHistory($actionID, $changes);
 
             die(js::reload('parent.parent'));

From 057f8978b1363830aa539d0952458101aabd7ae2 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 1 Dec 2017 09:09:15 +0800
Subject: [PATCH 08/40]  * fix bug #1300.

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

diff --git a/module/doc/view/view.html.php b/module/doc/view/view.html.php
index 6a6f24b71d..284c3dbecd 100644
--- a/module/doc/view/view.html.php
+++ b/module/doc/view/view.html.php
@@ -108,7 +108,7 @@
           <?php $uploadDate = $lang->file->uploadDate . substr($file->addedDate, 0, 10);?>
           <li class='list-group-item' title='<?php echo $uploadDate?>' style='position:relative;'>
             <a href="<?php echo $file->webPath?>" target="_blank">
-              <img onload="setImageSize(this,0)" src="<?php echo $file->webPath?>" alt="<?php echo $file->title?>">
+              <img onload="setImageSize(this,0)" src="<?php echo $this->createLink('file', 'read', "fileID={$file->id}");?>" alt="<?php echo $file->title?>">
             </a>
             <span class='right-icon' style='position:absolute;right:-18px;top:0px;'>
               <?php if(common::hasPriv('file', 'delete')) echo html::a('###', "<i class='icon-remove'></i>", '', "class='btn-icon' onclick='deleteFile($file->id)' title='$lang->delete'");?>

From fca246824ad255af7ade7c9a8704184e4876f61d Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 1 Dec 2017 09:17:04 +0800
Subject: [PATCH 09/40]  * fix bug #1298.

---
 module/task/control.php            | 3 ++-
 module/task/view/assignto.html.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/task/control.php b/module/task/control.php
index 4f723c9492..869c42b8a6 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -446,7 +446,8 @@ class task extends control
         $this->view->title      = $this->view->project->name . $this->lang->colon . $this->lang->task->assign;
         $this->view->position[] = $this->lang->task->assign;
         $this->view->task       = $task;
-        $this->view->users      = $members;
+        $this->view->members    = $members;
+        $this->view->users      = $this->loadModel('user')->getPairs();
         $this->display();
     }
 
diff --git a/module/task/view/assignto.html.php b/module/task/view/assignto.html.php
index 088b9770e5..b1bcc59ed1 100644
--- a/module/task/view/assignto.html.php
+++ b/module/task/view/assignto.html.php
@@ -23,7 +23,7 @@
   <table class='table table-form'>
     <tr>
       <th class='w-80px'><?php echo empty($task->team) ? $lang->task->assign : $lang->task->transferTo;?></th>
-      <td class='w-p25-f'><?php echo html::select('assignedTo', $users, $task->assignedTo, "class='form-control chosen'");?></td><td></td>
+      <td class='w-p25-f'><?php echo html::select('assignedTo', $members, $task->assignedTo, "class='form-control chosen'");?></td><td></td>
     </tr>  
     <tr>
       <th><?php echo $lang->task->left;?></th>

From 66e5d7f47ab4e7ded5769996ed101b076027eddf Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 1 Dec 2017 09:36:22 +0800
Subject: [PATCH 10/40]  * fix bug #1313.

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

diff --git a/module/task/control.php b/module/task/control.php
index 869c42b8a6..88e7440f4c 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -779,6 +779,7 @@ class task extends control
         $task    = $this->view->task;
         $members = $this->loadModel('user')->getPairs('noletter');
 
+        $this->view->users = $members;
         if(!empty($task->team))
         {
             $task->openedBy   = $this->task->getNextUser(array_keys($task->team), $task->assignedTo);
@@ -789,7 +790,7 @@ class task extends control
         $this->view->title      = $this->view->project->name . $this->lang->colon .$this->lang->task->finish;
         $this->view->position[] = $this->lang->task->finish;
         $this->view->members    = $members;
-       
+
         $this->display();
     }
 
@@ -822,6 +823,7 @@ class task extends control
         $this->view->title      = $this->view->project->name . $this->lang->colon .$this->lang->task->pause;
         $this->view->position[] = $this->lang->task->pause;
         
+        $this->view->users = $this->loadModel('user')->getPairs('noletter');
         $this->display();
     }
 
diff --git a/module/task/model.php b/module/task/model.php
index 257e7da219..515580428f 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1129,7 +1129,7 @@ class taskModel extends model
         if(!empty($task->parent)) $task->parentName = $this->dao->findById($task->parent)->from(TABLE_TASK)->fetch('name');
 
         $teams = $this->dao->select('*')->from(TABLE_TEAM)->where('task')->eq($taskID)->orderBy('order_desc')->fetchGroup('task', 'account');
-        foreach($teams as $key => $team) $teams[$key] = array_reverse($team);
+        foreach($teams as $key => $team) $teams[$key] = array_reverse($team, true);
         $task->team = isset($teams[$taskID]) ? $teams[$taskID] : array();
         foreach($children as $child) $child->team = isset($teams[$child->id]) ? $teams[$child->id] : array();
 

From ef4e8a2cbd477644bb987527bd055338c9527070 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 1 Dec 2017 09:43:56 +0800
Subject: [PATCH 11/40]  * fix bug #1310.

---
 module/story/js/create.js         | 2 --
 module/story/view/header.html.php | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/story/js/create.js b/module/story/js/create.js
index ea3a5cc9ec..b7f5c069f8 100644
--- a/module/story/js/create.js
+++ b/module/story/js/create.js
@@ -33,5 +33,3 @@ $(function()
     ajustFilebox();
     $(window).resize(ajustFilebox);
 });
-
-
diff --git a/module/story/view/header.html.php b/module/story/view/header.html.php
index 5ccfac51a6..02f7f613c2 100644
--- a/module/story/view/header.html.php
+++ b/module/story/view/header.html.php
@@ -19,12 +19,14 @@ function loadBranch()
 function loadProductBranches(productID)
 {
     $('#branch').remove();
+    $('#branch_chosen').remove();
     $.get(createLink('branch', 'ajaxGetBranches', "productID=" + productID), function(data)
     {
         if(data)
         {
             $('#product').closest('.input-group').append(data);
             $('#branch').css('width', config.currentMethod == 'create' ? '120px' : '65px');
+            $('#branch').chosen(defaultChosenOptions);
         }
     })
 }

From 6f8543277edf32d0f3c7a6fe51b63a1df2b8b7e1 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 1 Dec 2017 10:22:25 +0800
Subject: [PATCH 12/40]  * fix bug #1307.

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

diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index cb440341e7..6c1fd8992e 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -806,3 +806,5 @@ body {color:#141414; padding-bottom: 40px;}
 .icon-review:before{content: '\e9b8'}
 .icon-checked:before{content: '\e642'}
 .icon-file-text:before{content:'\e6d4'}
+
+body.body-modal .ke-container .ke-toolbar .ke-outline[data-name=fullscreen]{display:none;}

From 3664bd09c8bbac1c459b9b53a9fa5e2edab49aa0 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 1 Dec 2017 10:44:21 +0800
Subject: [PATCH 13/40]  * fix bug #1314.

---
 module/score/model.php | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/module/score/model.php b/module/score/model.php
index 2581d4cf07..be845e55e7 100644
--- a/module/score/model.php
+++ b/module/score/model.php
@@ -43,7 +43,7 @@ class scoreModel extends model
         $desc     = $this->lang->score->modules[$module];
         $user     = empty($account) ? $this->app->user->account : $account;
         $time     = empty($time) ? helper::now() : $time;
-        $extended = "ruleExtended[$module][$method]";
+        $extended = $this->config->score->ruleExtended[$module][$method];
 
         if(is_numeric($param)) $desc .= 'ID:' . $param;
 
@@ -54,9 +54,9 @@ class scoreModel extends model
 
                 if($method == 'changePassword')
                 {
-                    if(!empty($this->config->score->{$extended}['strength'][$param]))
+                    if(!empty($extended['strength'][$param]))
                     {
-                        $rule['score'] = $rule['score'] + $this->config->score->{$extended}['strength'][$param];
+                        $rule['score'] = $rule['score'] + $extended['strength'][$param];
                     }
                     $desc = $this->lang->score->methods[$module][$method];
                 }
@@ -69,7 +69,7 @@ class scoreModel extends model
                     if(!empty($openedBy))
                     {
                         $newRule          = $rule;
-                        $newRule['score'] = $this->config->score->{$extended}['createID'];
+                        $newRule['score'] = $extended['createID'];
                         $this->saveScore($openedBy, $newRule, $module, $method, $desc, $time);
                         unset($newRule);
                     }
@@ -86,9 +86,9 @@ class scoreModel extends model
 
                     $task = $this->loadModel('task')->getById($param);
 
-                    if(!empty($this->config->score->{$extended}['pri'][$task->pri]))
+                    if(!empty($extended['pri'][$task->pri]))
                     {
-                        $rule['score'] = $rule['score'] + $this->config->score->{$extended}['pri'][$task->pri];
+                        $rule['score'] = $rule['score'] + $extended['pri'][$task->pri];
                     }
 
                     if(!empty($task->estimate))
@@ -111,15 +111,15 @@ class scoreModel extends model
                 {
                     $user  = $param->openedBy;
                     $desc .= 'ID:' . $param->id;
-                    if(!empty($this->config->score->{$extended}['severity'][$param->severity]))
+                    if(!empty($extended['severity'][$param->severity]))
                     {
-                        $rule['score'] = $rule['score'] + $this->config->score->{$extended}['severity'][$param->severity];
+                        $rule['score'] = $rule['score'] + $extended['severity'][$param->severity];
                     }
                 }
 
-                if($method == 'resolve' && !empty($this->config->score->{$extended}['severity'][$param->severity]))
+                if($method == 'resolve' && !empty($extended['severity'][$param->severity]))
                 {
-                    $rule['score'] = $rule['score'] + $this->config->score->{$extended}['severity'][$param->severity];
+                    $rule['score'] = $rule['score'] + $extended['severity'][$param->severity];
                 }
                 break;
             case 'testTask':
@@ -134,10 +134,10 @@ class scoreModel extends model
                     /* Project PM. */
                     if(!empty($param->PM))
                     {
-                        $rule['score'] = $this->config->score->{$extended}['manager']['close'];
+                        $rule['score'] = $extended['manager']['close'];
                         if($param->end > date('Y-m-d', $timestamp))
                         {
-                            $rule['score'] += $this->config->score->{$extended}['manager']['onTime'];
+                            $rule['score'] += $extended['manager']['onTime'];
                         }
                         $this->saveScore($param->PM, $rule, $module, $method, $desc, $time);
                     }
@@ -146,10 +146,10 @@ class scoreModel extends model
                     $teams = $this->dao->select('account')->from(TABLE_TEAM)->where('project')->eq($param->id)->fetchPairs();
                     if(!empty($teams))
                     {
-                        $rule['score'] = $this->config->score->{$extended}['member']['close'];
+                        $rule['score'] = $extended['member']['close'];
                         if($param->end > date('Y-m-d', $timestamp))
                         {
-                            $rule['score'] += $this->config->score->{$extended}['member']['onTime'];
+                            $rule['score'] += $extended['member']['onTime'];
                         }
 
                         foreach($teams as $user)

From c49a2c8fca71b693a987c71482ce755835551168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <memory@lvtao.net>
Date: Fri, 1 Dec 2017 11:24:53 +0800
Subject: [PATCH 14/40] * Fix bug

---
 module/score/model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/score/model.php b/module/score/model.php
index be845e55e7..011c3ab897 100644
--- a/module/score/model.php
+++ b/module/score/model.php
@@ -187,6 +187,7 @@ class scoreModel extends model
      */
     private function saveScore($account = '', $rule = array(), $module = '', $method = '', $desc = '', $time = '')
     {
+        if($rule['score'] == 0) return true;
         if(!empty($rule['times']) || !empty($rule['hour']))
         {
             if(empty($rule['hour']))

From 74adf6ae8fa5290da62cff2ca76aa7c7c2b1a222 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 1 Dec 2017 11:25:51 +0800
Subject: [PATCH 15/40]  * fix bug #1316.

---
 module/score/model.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/score/model.php b/module/score/model.php
index be845e55e7..2ea34e99d4 100644
--- a/module/score/model.php
+++ b/module/score/model.php
@@ -43,7 +43,7 @@ class scoreModel extends model
         $desc     = $this->lang->score->modules[$module];
         $user     = empty($account) ? $this->app->user->account : $account;
         $time     = empty($time) ? helper::now() : $time;
-        $extended = $this->config->score->ruleExtended[$module][$method];
+        $extended = isset($this->config->score->ruleExtended[$module][$method]) ? $this->config->score->ruleExtended[$module][$method] : array();
 
         if(is_numeric($param)) $desc .= 'ID:' . $param;
 
@@ -207,6 +207,7 @@ class scoreModel extends model
         }
 
         $user = $this->loadModel('user')->getById($account);
+        if(empty($user)) return false;
 
         $data = new stdClass();
         $data->account  = $account;
@@ -219,7 +220,7 @@ class scoreModel extends model
         $data->time     = empty($time) ? helper::now() : $time;
         $this->dao->insert(TABLE_SCORE)->data($data)->exec();
 
-        $this->dao->query("UPDATE " . TABLE_USER . " SET `score`=`score` + " . $rule['score'] . ",`scoreLevel`=`scoreLevel` + " . $rule['score'] . " WHERE `account`='" . $account . "'");
+        $this->dao->update(TABLE_USER)->set("`score`=`score` + " . $rule['score'])->set("`scoreLevel`=`scoreLevel` + " . $rule['score'])->where('account')->eq($account)->exec();
     }
 
     /**

From 8be716b8a5d2888a11b05570c6209b44255f55f2 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 1 Dec 2017 13:17:16 +0800
Subject: [PATCH 16/40]  * fix bug #1309.

---
 module/product/control.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/module/product/control.php b/module/product/control.php
index eebc2b9f61..88f7f5e66a 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -753,7 +753,7 @@ class product extends control
      * @access public
      * @return void
      */
-    public function build($productID = 0)
+    public function build($productID = 0, $branch = 0)
     {
         $this->app->loadLang('build');
         $this->session->set('productList', $this->app->getURI(true));
@@ -765,7 +765,7 @@ class product extends control
         /* Get current product. */
         $productID = $this->product->saveState($productID, $this->products);
         $product   = $this->product->getById($productID);
-        $this->product->setMenu($this->products, $productID);
+        $this->product->setMenu($this->products, $productID, $branch);
 
         /* Set menu.*/
         $this->session->set('buildList', $this->app->getURI(true));
@@ -774,7 +774,10 @@ class product extends control
         $this->view->position[] = $this->lang->product->build;
         $this->view->products   = $this->products;
         $this->view->product    = $product;
-        $this->view->builds     = $this->dao->select('*')->from(TABLE_BUILD)->where('product')->eq($productID)->andWhere('deleted')->eq(0)->fetchAll();
+        $this->view->builds     = $this->dao->select('*')->from(TABLE_BUILD)->where('product')->eq($productID)
+            ->beginIF($branch)->andWhere('branch')->eq($branch)->fi()
+            ->andWhere('deleted')->eq(0)
+            ->fetchAll();
         $this->view->users      = $this->loadModel('user')->getPairs('noletter');
 
         $this->display();

From 18cb10cfa358a0464aa13449f42235cc8ec44bf0 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 1 Dec 2017 13:48:33 +0800
Subject: [PATCH 17/40]  * fix bug #1306.

---
 module/bug/css/browse.css      | 2 --
 module/product/css/browse.css  | 1 -
 module/project/css/task.css    | 2 +-
 module/testcase/css/browse.css | 1 -
 module/testtask/css/cases.css  | 2 --
 5 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/module/bug/css/browse.css b/module/bug/css/browse.css
index 263e58bcd5..4b05fd42c7 100644
--- a/module/bug/css/browse.css
+++ b/module/bug/css/browse.css
@@ -15,5 +15,3 @@
 .dropdown-list > li > a {display: block; padding: 3px 20px; clear: both; font-weight: normal; line-height: 1.53846154; color: #141414; white-space: nowrap;}
 .dropdown-list > li > a:hover,
 .dropdown-list > li > a:focus {color: #1a4f85;text-decoration: none;background-color: #ddd;}
-
-#bugForm{overflow-y:auto;}
diff --git a/module/product/css/browse.css b/module/product/css/browse.css
index 66be1da2a5..e6c75dc9b9 100644
--- a/module/product/css/browse.css
+++ b/module/product/css/browse.css
@@ -16,4 +16,3 @@ a.removeModule{color:#ddd}
 a.removeModule:hover{color:red}
 
 tbody > tr > td > .btn-icon {margin-right: 3px;}
-#productStoryForm{overflow-y:auto;}
diff --git a/module/project/css/task.css b/module/project/css/task.css
index 5c9b310371..9004885852 100644
--- a/module/project/css/task.css
+++ b/module/project/css/task.css
@@ -24,4 +24,4 @@
 .pl-5px{padding-left:5px;}
 
 tbody > tr > td > .btn-icon {margin-right: 2px}
-#projectTaskForm{overflow-x:auto; padding:0px 1px;}
+#projectTaskForm{padding:0px 1px;}
diff --git a/module/testcase/css/browse.css b/module/testcase/css/browse.css
index 29bc6073e9..877b99ebf5 100644
--- a/module/testcase/css/browse.css
+++ b/module/testcase/css/browse.css
@@ -16,4 +16,3 @@
 
 tbody > tr > td > .btn-icon {margin-right: 3px;}
 tbody > tr > td   .icon-bug {margin-left: -8px;}
-#batchForm{overflow-y:auto;}
diff --git a/module/testtask/css/cases.css b/module/testtask/css/cases.css
index ce212f1622..902a7fe6ca 100644
--- a/module/testtask/css/cases.css
+++ b/module/testtask/css/cases.css
@@ -8,5 +8,3 @@ tfoot.fixedTfootAction .chosen-results li.active-result {color: black;}
 tfoot .table-actions .input-group #assignedTo_chosen .chosen-single{height:24px;padding:3px 6px}
 tfoot .table-actions .input-group #assignedTo_chosen .chosen-single span{font-size:12px;}
 tfoot .table-actions .input-group #assignedTo_chosen .chosen-single div{line-height:10px;}
-
-#caseForm{overflow-y:auto}

From be4b83290944a348dee42f792bd1d059b5fe74b3 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 1 Dec 2017 13:55:14 +0800
Subject: [PATCH 18/40]  * fix bug #1296.

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

diff --git a/module/task/model.php b/module/task/model.php
index 515580428f..74001f134d 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -2032,7 +2032,7 @@ class taskModel extends model
                 case 'name':
                     if(!empty($task->product) && isset($branchGroups[$task->product][$task->branch])) echo "<span class='label label-info label-badge'>" . $branchGroups[$task->product][$task->branch] . '</span> ';
                     if($task->module and isset($modulePairs[$task->module])) echo "<span class='label label-info label-badge'>" . $modulePairs[$task->module] . '</span> ';
-                    if($child) echo '<span class="label">' . $this->lang->task->childrenAB . '</span> ';
+                    if($child or !empty($task->parent)) echo '<span class="label">' . $this->lang->task->childrenAB . '</span> ';
                     if(!empty($task->team)) echo '<span class="label">' . $this->lang->task->multipleAB . '</span> ';
                     echo $canView ? html::a($taskLink, $task->name, null, "style='color: $task->color'") : "<span style='color: $task->color'>$task->name</span>";
                     if($task->fromBug) echo html::a(helper::createLink('bug', 'view', "id=$task->fromBug"), "[BUG#$task->fromBug]", '_blank', "class='bug'");

From 29f7e91a9f6d0c7025327397706726f8e35080b3 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 1 Dec 2017 14:00:21 +0800
Subject: [PATCH 19/40]  * fix bug #1290.

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

diff --git a/module/project/model.php b/module/project/model.php
index 1b6c04c68e..057ff957ca 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -976,6 +976,7 @@ class projectModel extends model
             ->where('project')->eq((int)$projectID)
             ->andWhere('status')->ne('cancel')
             ->andWhere('deleted')->eq(0)
+            ->andWhere('parent')->eq(0)
             ->fetch();
         $project->days          = $project->days ? $project->days : '';
         $project->totalHours    = $this->dao->select('sum(days * hours) AS totalHours')->from(TABLE_TEAM)->where('project')->eq($project->id)->fetch('totalHours');

From 62cc1623583afc85040f5bb06f19349e4401e66e Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 1 Dec 2017 14:10:19 +0800
Subject: [PATCH 20/40]  * fix bug #1286.

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

diff --git a/module/testsuite/control.php b/module/testsuite/control.php
index 5433c860fa..7b224a055f 100644
--- a/module/testsuite/control.php
+++ b/module/testsuite/control.php
@@ -814,7 +814,7 @@ class testsuite extends control
         $libraries = $this->testsuite->getLibraries();
         if(empty($libraries)) $this->locate(inlink('createLib'));
 
-        $this->testsuite->setMenu($libraries, $libID);
+        $this->testsuite->setLibMenu($libraries, $libID);
 
         $file       = $this->session->importFile;
         $caseLang   = $this->lang->testcase;

From 7b9b7d4a40c2a358d32cb2d5f6ae8f78ec165532 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <memory@lvtao.net>
Date: Fri, 1 Dec 2017 14:23:57 +0800
Subject: [PATCH 21/40] * Fix bug

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

diff --git a/module/bug/model.php b/module/bug/model.php
index 31ef282a55..962eebe8f7 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -728,7 +728,7 @@ class bugModel extends model
             ->setDefault('lastEditedBy', $this->app->user->account)
             ->setDefault('lastEditedDate', $now)
             ->setDefault('assignedDate', $now)
-            ->remove('comment')
+            ->remove('comment,showModule')
             ->join('mailto', ',')
             ->get();
 

From a6aeaf2cb5b747c038ff2846b3804700cace9d1c Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 1 Dec 2017 14:27:51 +0800
Subject: [PATCH 22/40]  * fix bug #1285.

---
 module/task/model.php                    | 2 +-
 module/task/view/recordestimate.html.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/task/model.php b/module/task/model.php
index 74001f134d..98cfe25d6b 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -635,8 +635,8 @@ class taskModel extends model
             ->cleanFloat('left')
             ->setDefault('lastEditedBy', $this->app->user->account)
             ->setDefault('lastEditedDate', $now)
-            ->remove('comment,showModule')
             ->setDefault('assignedDate', $now)
+            ->remove('comment,showModule')
             ->get();
 
         $this->dao->update(TABLE_TASK)
diff --git a/module/task/view/recordestimate.html.php b/module/task/view/recordestimate.html.php
index d22750f66d..697cfa17ed 100644
--- a/module/task/view/recordestimate.html.php
+++ b/module/task/view/recordestimate.html.php
@@ -22,7 +22,7 @@
   </div>
 </div>
 <div class='main'>
-  <form class='form-condensed' id="recordForm" method='post' target='hiddenwin'>
+  <form class='form-condensed' id="recordForm" method='post' target='hiddenwin' style='margin-top:25px'>
     <table class='table table-form table-fixed'>
       <?php if(count($estimates)):?>
       <thead>
@@ -72,7 +72,7 @@
         <td><?php echo html::input("dates[$i]", '', "class='form-control text-center form-date'");?></td>
         <td><?php echo html::input("consumed[$i]", '', "class='form-control text-center' autocomplete='off'");?></td>
         <td><?php echo html::input("left[$i]", '', "class='form-control text-center left' autocomplete='off'");?></td>
-        <td class="text-left"><?php echo html::textarea("work[$i]", '', "class='form-control' rows='2'");?></td>
+        <td class="text-left"><?php echo html::textarea("work[$i]", '', "class='form-control' style='height:50px;'");?></td>
         <td></td>
       </tr>
       <?php endfor;?>

From c2fe7af6f0bd4b660b8875bd22bfec894035e3c1 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 1 Dec 2017 14:44:04 +0800
Subject: [PATCH 23/40]  * fix bug #1284.

---
 module/task/view/view.html.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index b063ee50e1..36f4a8577c 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -76,6 +76,7 @@
         <legend><?php echo $lang->task->legendDesc;?></legend>
         <div class='article-content'><?php echo $task->desc;?></div>
       </fieldset>
+      <?php if($project->type != 'ops'):?>
       <?php if($task->fromBug != 0):?>
       <fieldset>
         <legend><?php echo $lang->bug->steps;?></legend>
@@ -102,7 +103,8 @@
         </div>
       </fieldset>
       <?php endif;?>
-        <?php if(!empty($task->children)):?>
+      <?php endif;?>
+      <?php if(!empty($task->children)):?>
       <fieldset>
         <legend><?php echo $this->lang->task->children;?></legend>
         <table class='table table-hover table-data table-fixed'>
@@ -147,7 +149,7 @@
             <?php endforeach;?>
         </table>
       </fieldset>
-        <?php endif;?>
+      <?php endif;?>
       <?php echo $this->fetch('file', 'printFiles', array('files' => $task->files, 'fieldset' => 'true'));?>
       <?php include '../../common/view/action.html.php';?>
       <div class='actions'> <?php if(!$task->deleted) echo $actionLinks;?></div>

From 6df5ea26453b0f624ec7499780d0fe051f6ca31b Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 1 Dec 2017 14:45:51 +0800
Subject: [PATCH 24/40]  * fix bug #1293.

---
 module/bug/lang/en.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index 5d969c580a..4db584e6cd 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -230,7 +230,7 @@ $lang->bug->typeList['others']       = 'Other';
 
 $lang->bug->statusList['']         = '';
 $lang->bug->statusList['active']   = 'Active';
-$lang->bug->statusList['resolved'] = 'Reolved';
+$lang->bug->statusList['resolved'] = 'Resolved';
 $lang->bug->statusList['closed']   = 'Closed';
 
 $lang->bug->confirmedList[1] = 'Confirmed';

From ede35673b6ed96f9d5e47b9fb57131dfd7421bb0 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 1 Dec 2017 15:15:38 +0800
Subject: [PATCH 25/40]  * fix bug #1292.

---
 module/project/control.php |  1 -
 module/task/control.php    | 14 +-------------
 module/task/model.php      | 23 +++++++++--------------
 3 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/module/project/control.php b/module/project/control.php
index 21593c53b4..cdfa144487 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -137,7 +137,6 @@ class project extends control
         $products  = $this->config->global->flow == 'onlyTask' ? array() : $this->loadModel('product')->getProductsByProject($projectID);
         setcookie('preProjectID', $projectID, $this->config->cookieLife, $this->config->webRoot);
 
-
         if($this->cookie->preProjectID != $projectID)
         {
             $_COOKIE['moduleBrowseParam'] = $_COOKIE['productBrowseParam'] = 0;
diff --git a/module/task/control.php b/module/task/control.php
index 88e7440f4c..84a865803b 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -1191,9 +1191,6 @@ class task extends control
                     ->beginIF($this->post->exportType == 'selected')->andWhere('t1.id')->in($this->cookie->checkedItem)->fi()
                     ->orderBy($orderBy)->fetchAll('id');
 
-                $taskList = array_keys($tasks);
-                if(!empty($taskList)) $children = $this->dao->select('*')->from(TABLE_TASK)->where('parent')->in($taskList)->fetchGroup('parent');
-
                 foreach($tasks as $key => $task)
                 {
                     /* Compute task progress. */
@@ -1212,16 +1209,7 @@ class task extends control
 
                     $task->progress .= '%';
 
-                    $tasks[$key] = $task;
-
-                    if(isset($children[$task->id])) 
-                    {
-                        foreach($children[$task->id] as $child)
-                        {
-                            $child->name       = '[' . $taskLang->childrenAB . '] ' . $child->name;
-                            $tasks[$child->id] = $child;
-                        }
-                    }
+                    if($task->parent) $task->name = '[' . $taskLang->childrenAB . '] ' . $task->name;
                 }
             }
             else
diff --git a/module/task/model.php b/module/task/model.php
index 98cfe25d6b..626855d76f 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1216,7 +1216,6 @@ class taskModel extends model
             ->leftJoin(TABLE_USER)->alias('t3')->on('t1.assignedTo = t3.account')
             ->where('t1.project')->eq((int)$projectID)
             ->andWhere('t1.deleted')->eq(0)
-            ->andWhere('t1.parent')->eq(0)
             ->beginIF($productID)->andWhere('t2.product')->eq((int)$productID)->fi()
             ->beginIF($type == 'undone')->andWhere("(t1.status = 'wait' or t1.status ='doing')")->fi()
             ->beginIF($type == 'needconfirm')->andWhere('t2.version > t1.storyVersion')->andWhere("t2.status = 'active'")->fi()
@@ -1225,26 +1224,22 @@ class taskModel extends model
             ->beginIF($type == 'delayed')->andWhere('t1.deadline')->gt('1970-1-1')->andWhere('t1.deadline')->lt(date(DT_DATE1))->andWhere('t1.status')->in('wait,doing')->fi()
             ->beginIF(is_array($type) or strpos(',all,undone,needconfirm,assignedtome,delayed,finishedbyme,', ",$type,") === false)->andWhere('t1.status')->in($type)->fi()
             ->beginIF($modules)->andWhere('t1.module')->in($modules)->fi()
-            ->orderBy($orderBy)
+            ->orderBy('t1.`parent`,' . $orderBy)
             ->page($pager)
             ->fetchAll('id');
 
         $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'task', ($productID or $type == 'needconfirm') ? false : true);
 
         $taskList = array_keys($tasks);
-        if(!empty($taskList))
+        $taskTeam = $this->dao->select('*')->from(TABLE_TEAM)->where('task')->in($taskList)->fetchGroup('task');
+        foreach($taskTeam as $taskID => $team) $tasks[$taskID]->team = $team;
+        foreach($tasks as $taskID => $task)
         {
-            $children = $this->dao->select('t1.*, t2.id AS storyID, t2.title AS storyTitle, t2.product, t2.branch, t2.version AS latestStoryVersion, t2.status AS storyStatus, t3.realname AS assignedToRealName')
-                ->from(TABLE_TASK)->alias('t1')
-                ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story = t2.id')
-                ->leftJoin(TABLE_USER)->alias('t3')->on('t1.assignedTo = t3.account')
-                ->where('t1.parent')->in($taskList)
-                ->andWhere('t1.deleted')->eq(0)
-                ->orderBy('id_desc')
-                ->fetchGroup('parent');
-            foreach($children as $key => $child) $tasks[$key]->children = $child;
-            $taskTeam = $this->dao->select('*')->from(TABLE_TEAM)->where('task')->in($taskList)->fetchGroup('task');
-            foreach($taskTeam as $taskID => $team) $tasks[$taskID]->team = $team;
+            if($task->parent and isset($tasks[$task->parent]))
+            {
+                $tasks[$task->parent]->children[] = $task;
+                unset($tasks[$taskID]);
+            }
         }
 
         if($tasks) return $this->processTasks($tasks);

From 67c4ed6cc4b58ea7ebd5227d1049aeea73e0b65d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <memory@lvtao.net>
Date: Fri, 1 Dec 2017 16:24:56 +0800
Subject: [PATCH 26/40] * Fix 1317

---
 module/story/model.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/module/story/model.php b/module/story/model.php
index a1631efaa2..c4d6ee8aa8 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -466,7 +466,6 @@ class storyModel extends model
             ->add('lastEditedDate', $now)
             ->setDefault('status', $oldStory->status)
             ->setDefault('product', $oldStory->product)
-            ->setDefault('plan', $oldStory->plan)
             ->setDefault('branch', $oldStory->branch)
             ->setIF($this->post->assignedTo   != $oldStory->assignedTo, 'assignedDate', $now)
             ->setIF($this->post->closedBy     != false and $oldStory->closedDate == '', 'closedDate', $now)

From bf7126e3af44c7bd0a770f5b23cabbf4dd0f949b Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 4 Dec 2017 11:36:18 +0800
Subject: [PATCH 27/40]  * fix bug #1297.

---
 module/task/control.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/module/task/control.php b/module/task/control.php
index 84a865803b..bc8da8d463 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -782,9 +782,13 @@ class task extends control
         $this->view->users = $members;
         if(!empty($task->team))
         {
-            $task->openedBy   = $this->task->getNextUser(array_keys($task->team), $task->assignedTo);
-            $members          = $this->task->getMemberPairs($task);
+            $teams = array_keys($task->team);
+
+            $task->openedBy   = $this->task->getNextUser($teams, $task->assignedTo);
             $task->myConsumed = $this->dao->select('consumed')->from(TABLE_TEAM)->where('task')->eq($taskID)->andWhere('account')->eq($task->assignedTo)->fetch('consumed');
+
+            $lastAccount = end($teams);
+            if($lastAccount != $task->assignedTo) $members = $this->task->getMemberPairs($task);
         }
 
         $this->view->title      = $this->view->project->name . $this->lang->colon .$this->lang->task->finish;

From 37aeaa887f8763d58adc58edaf05ef4387456d4d Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 4 Dec 2017 13:16:38 +0800
Subject: [PATCH 28/40]  * fix bug #1291.

---
 module/task/model.php | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/module/task/model.php b/module/task/model.php
index 626855d76f..6104e258bb 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -349,11 +349,10 @@ class taskModel extends model
         $teams = array();
         if($this->post->multiple)
         {
-            $estimate = 0;
-            $left     = 0;
             foreach($this->post->team as $row => $account)
             {
                 if(empty($account) or isset($team[$account])) continue;
+
                 $member = new stdClass();
                 $member->project  = 0;
                 $member->account  = $account;
@@ -365,20 +364,12 @@ class taskModel extends model
                 $member->left     = $member->estimate - $member->consumed;
                 $member->order    = $row;
                 $teams[$account]  = $member;
-
-                $estimate += (float)$member->eatimate;
-                $left     += (float)$member->left;
             }
 
-            if(!empty($teams))
+            if(!empty($teams) and !isset($task->assignedTo))
             {
-                $task->estimate = $estimate;
-                $task->left     = $left;
-                if(!isset($task->assignedTo))
-                {
-                    $firstMember      = reset($teams);
-                    $task->assignedTo = $firstMember->account;
-                }
+                $firstMember      = reset($teams);
+                $task->assignedTo = $firstMember->account;
             }
         }
 

From 11ad8f1d957bedfe151518ccbfcddfa32495b2c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <memory@lvtao.net>
Date: Mon, 4 Dec 2017 13:32:17 +0800
Subject: [PATCH 29/40] * Fix bug 1315

---
 module/custom/model.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/module/custom/model.php b/module/custom/model.php
index 53eb15e080..8a48482aaa 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -21,11 +21,18 @@ class customModel extends model
     {
         $allCustomLang = $this->dao->select('*')->from(TABLE_LANG)->orderBy('lang,id')->fetchAll('id');
 
-        $currentLang   = $this->app->getClientLang();
+        $currentLang = $this->app->getClientLang();
+        $sectionLang = array();
+        foreach($allCustomLang as $customLang)
+        {
+            $sectionLang[$customLang->module][$customLang->section][$customLang->lang] = $customLang->lang;
+        }
+
         $processedLang = array();
         foreach($allCustomLang as $id => $customLang)
         {
             if($customLang->lang != $currentLang and $customLang->lang != 'all') continue;
+            if(isset($sectionLang[$customLang->module][$customLang->section]['all']) && isset($sectionLang[$customLang->module][$customLang->section][$currentLang]) && $customLang->lang == 'all') continue;
             $processedLang[$customLang->module][$customLang->section][$customLang->key] = $customLang->value;
         }
 

From e2070d56b1d8c8b34e9f3674fc7d847bde7ee7e4 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 4 Dec 2017 13:37:43 +0800
Subject: [PATCH 30/40]  * fix bug #1279.

---
 module/group/view/manageview.html.php | 1 +
 module/product/control.php            | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/module/group/view/manageview.html.php b/module/group/view/manageview.html.php
index 7c451d4cd8..2659d5dc6e 100644
--- a/module/group/view/manageview.html.php
+++ b/module/group/view/manageview.html.php
@@ -26,6 +26,7 @@
       </th>
       <td class='w-p60'>
         <?php foreach($lang->menu as $menu):?>
+        <?php if(!is_string($menu)) continue;?>
         <?php list($moduleName, $module) = explode('|', $menu);?>
         <?php if($module == 'my') continue;?>
         <?php $moduleName = strip_tags($moduleName);?>
diff --git a/module/product/control.php b/module/product/control.php
index 88f7f5e66a..df34e44462 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -220,6 +220,12 @@ class product extends control
             $productID = $this->product->create();
             if(dao::isError()) die(js::error(dao::getError()));
             $this->loadModel('action')->create('product', $productID, 'opened');
+
+            if(isset($this->config->global->flow) and $this->config->global->flow == 'onlyTest')
+            {
+                die(js::locate($this->createLink($this->moduleName, 'build', "productID=$productID"), 'parent'));
+            }
+
             die(js::locate($this->createLink($this->moduleName, 'browse', "productID=$productID"), 'parent'));
         }
 

From d7ed9c0bbb4b6a6fbf10b81fab9444719f38c21a Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 4 Dec 2017 14:09:51 +0800
Subject: [PATCH 31/40]  * adjust code for showimport.

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

diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php
index ca90cbda7b..7549d6c9ac 100644
--- a/module/testcase/view/showimport.html.php
+++ b/module/testcase/view/showimport.html.php
@@ -83,7 +83,7 @@
     </tbody>
     <tfoot>
       <tr>
-        <td colspan='10' class='text-center'>
+        <td colspan='<?php echo !empty($branches) ? 11 : 10;?>' class='text-center'>
           <?php
           if(!$insert)
           {

From 91cc9135f1300d841124533a4f2839d891660f4f Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 4 Dec 2017 14:21:12 +0800
Subject: [PATCH 32/40]  * fix bug #1262.

---
 module/user/view/deny.html.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/module/user/view/deny.html.php b/module/user/view/deny.html.php
index 6ba2c19f12..2e9a97cfd6 100644
--- a/module/user/view/deny.html.php
+++ b/module/user/view/deny.html.php
@@ -39,9 +39,11 @@ include '../../common/view/header.lite.html.php';
     </div>
     <div class='modal-footer'>
     <?php
-    echo html::a($this->createLink($config->default->module), $lang->my->common, '', "class='btn'");
-    if($refererBeforeDeny) echo html::a(helper::safe64Decode($refererBeforeDeny), $lang->user->goback, '', "class='btn'");
-    echo html::a($this->createLink('user', 'logout', "referer=" . helper::safe64Encode($denyPage)), $lang->user->relogin, '', "class='btn btn-primary'");
+    $isOnlybody = helper::inOnlyBodyMode();
+    unset($_GET['onlybody']);
+    echo html::a($this->createLink($config->default->module), $lang->my->common, ($isOnlybody ? '_parent' : ''), "class='btn'");
+    if($refererBeforeDeny) echo html::a(helper::safe64Decode($refererBeforeDeny), $lang->user->goback, ($isOnlybody ? '_parent' : ''), "class='btn'");
+    echo html::a($this->createLink('user', 'logout', "referer=" . helper::safe64Encode($denyPage)), $lang->user->relogin, ($isOnlybody ? '_parent' : ''), "class='btn btn-primary'");
     ?></div>
   </div>
 </div>

From aa391ba138cbdb70ba35450ed6448f15ce00c7b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <memory@lvtao.net>
Date: Mon, 4 Dec 2017 14:49:54 +0800
Subject: [PATCH 33/40] * Fix bug 1278

---
 module/product/view/browse.html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 156487f5db..a8468a6e69 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -281,14 +281,14 @@
                       $withSearch = count($users) > 10;
                       $actionLink = $this->createLink('story', 'batchAssignTo', "productID=$productID");
                       echo "<li class='dropdown-submenu'>";
-                      echo html::select('assignedTo', $users, '', 'class="hidden"');
+                      echo html::select('assignedTo', $users, 'admin', 'class="hidden"');
                       echo html::a('javascript::', $lang->story->assignedTo, '', 'id="assignItem"');
                       echo "<div class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
                       echo '<ul class="dropdown-list">';
                       foreach ($users as $key => $value)
                       {
                           if(empty($key) or $key == 'closed') continue;
-                          echo "<li class='option' data-key='$key'>" . html::a("javascript:$(\".table-actions #assignedTo\").val(\"$key\");setFormAction(\"$actionLink\")", $value, '', '') . '</li>';
+                          echo "<li class='option' data-key='$key'>" . html::a("javascript:$(\"#assignedTo\").val(\"$key\");setFormAction(\"$actionLink\",\"hiddenwin\")", $value, '', '') . '</li>';
                       }
                       echo "</ul>";
                       if($withSearch) echo "<div class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control'><span class='input-group-addon'><i class='icon-search'></i></span></div></div>";

From e1f20d5ef148b192f5d75fcb975ae5ffe0d32e2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <memory@lvtao.net>
Date: Mon, 4 Dec 2017 14:50:09 +0800
Subject: [PATCH 34/40] * Fix bug 1278

---
 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 41ed2cd56e..87c6df44a4 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -970,7 +970,7 @@ class story extends control
             }
         }
         if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
-        die(js::locate($this->session->storyList));
+        die(js::locate($this->session->storyList, 'parent'));
     }
 
     /**

From e082c20f90c374ef369c3e99033b41f833db79fc Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 4 Dec 2017 14:51:35 +0800
Subject: [PATCH 35/40]  * fix bug #1252.

---
 module/story/model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/story/model.php b/module/story/model.php
index c4d6ee8aa8..70e644ce34 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -1169,6 +1169,7 @@ class storyModel extends model
          */
         foreach($branchStatusList as $branch => $statusList)
         {
+            $stage      = 'projected';
             $testTasks  = isset($branchTestTasks[$branch]) ? $branchTestTasks[$branch] : 0;
             $develTasks = isset($branchDevelTasks[$branch]) ? $branchDevelTasks[$branch] : 0;
             if($statusList['devel']['doing'] > 0 and $statusList['test']['wait'] == $testTasks) $stage = 'developing'; 

From 5a76b904b39d90b3662c068a92a609ef2f674b95 Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Mon, 4 Dec 2017 15:14:45 +0800
Subject: [PATCH 36/40]  * fix bug #1294.

---
 module/bug/view/browse.html.php     | 2 +-
 module/product/view/browse.html.php | 2 +-
 module/project/css/common.css       | 6 +++---
 module/project/view/task.html.php   | 2 +-
 www/js/my.full.js                   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index e3a05d539f..c85b443295 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -175,7 +175,7 @@ js::set('branch', $branch);
     $widths  = $this->datatable->setFixedFieldWidth($setting);
     $columns = 0;
     ?>
-    <table class='table table-condensed table-hover table-striped tablesorter table-fixed <?php echo $useDatatable ? 'datatable' : ''?>' id='bugList' data-checkable='true' data-fixed-left-width='<?php echo $widths['leftWidth']?>' data-fixed-right-width='<?php echo $widths['rightWidth']?>' data-custom-menu='true' data-checkbox-name='bugIDList[]'>
+    <table class='table table-condensed table-hover table-striped tablesorter table-fixed <?php echo ($useDatatable ? 'datatable' : 'table-selectable');?>' id='bugList' data-checkable='true' data-fixed-left-width='<?php echo $widths['leftWidth']?>' data-fixed-right-width='<?php echo $widths['rightWidth']?>' data-custom-menu='true' data-checkbox-name='bugIDList[]'>
       <thead>
         <tr>
         <?php
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 156487f5db..7adc725dfa 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -112,7 +112,7 @@
     $widths  = $this->datatable->setFixedFieldWidth($setting);
     $columns = 0;
     ?>
-    <table class='table table-condensed table-hover table-striped tablesorter table-fixed <?php echo $useDatatable ? 'datatable' : ''?>' id='storyList' data-checkable='true' data-fixed-left-width='<?php echo $widths['leftWidth']?>' data-fixed-right-width='<?php echo $widths['rightWidth']?>' data-custom-menu='true' data-checkbox-name='storyIDList[]'>
+    <table class='table table-condensed table-hover table-striped tablesorter table-fixed <?php echo ($useDatatable ? 'datatable' : 'table-selectable');?>' id='storyList' data-checkable='true' data-fixed-left-width='<?php echo $widths['leftWidth']?>' data-fixed-right-width='<?php echo $widths['rightWidth']?>' data-custom-menu='true' data-checkbox-name='storyIDList[]'>
       <thead>
         <tr>
         <?php
diff --git a/module/project/css/common.css b/module/project/css/common.css
index d7f1c4f12f..5a3dbfc7ee 100644
--- a/module/project/css/common.css
+++ b/module/project/css/common.css
@@ -1,11 +1,11 @@
 .mgr-5px{margin-right:5px;}
 #productsBox .col-sm-3{margin-bottom:5px;}
 
-.table-children > td:first-child{border-left:2px solid #ccc}
-.table-children > td:last-child{;border-right:2px solid #ccc;}
+.table-children > td:first-child{border-left:2px solid #ccc;}
+.table-children > td:last-child{border-right:2px solid #ccc;}
 .fixed-left .table-children > td{border-right:none;}
 .flexarea .table-children > td{border-left:none;border-right:none;}
 .fixed-right .table-children > td{border-left:none;}
 .table-children.table-child-top{border-top:2px solid #ccc;}
 .table-children.table-child-bottom{border-bottom:2px solid #ccc;}
-.table-children td{background-color:#fff!important;}
+.table-striped>tbody>tr.table-children:nth-child(odd)>td, .table-striped>tbody>tr.table-children:nth-child(odd)>th{background-color:#fff;}
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index 75bb4ce13c..1d3c87c8c1 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -52,7 +52,7 @@ js::set('browseType', $browseType);
     $widths       = $this->datatable->setFixedFieldWidth($customFields);
     $columns      = 0;
     ?>
-    <table class='table table-condensed table-hover table-striped tablesorter table-fixed <?php if($useDatatable) echo 'datatable';?>' id='taskList' data-checkable='true' data-fixed-left-width='<?php echo $widths['leftWidth']?>' data-fixed-right-width='<?php echo $widths['rightWidth']?>' data-custom-menu='true' data-checkbox-name='taskIDList[]'>
+    <table class='table table-condensed table-hover table-striped tablesorter table-fixed <?php echo ($useDatatable ? 'datatable' : 'table-selectable');?> table-selectable' id='taskList' data-checkable='true' data-fixed-left-width='<?php echo $widths['leftWidth']?>' data-fixed-right-width='<?php echo $widths['rightWidth']?>' data-custom-menu='true' data-checkbox-name='taskIDList[]'>
       <thead>
         <tr>
         <?php
diff --git a/www/js/my.full.js b/www/js/my.full.js
index 764ba88526..41149b217e 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -681,7 +681,7 @@ function checkTable($table)
         $target.find('tbody > tr').toggleClass('active', isChecked).find('td :checkbox').prop('checked', isChecked);
     });
 
-    $table = $table || $('.table-selectable');
+    $table = $table || $('.table-selectable,table[checkable="true"]');
 
     if(!$table.length) return;
 

From da6a23e7bcfe52b027224c0f4203c665c744eb32 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 4 Dec 2017 15:24:27 +0800
Subject: [PATCH 37/40]  * fix bug #1132.

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

diff --git a/module/bug/model.php b/module/bug/model.php
index 962eebe8f7..8b8b380b32 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -1760,7 +1760,7 @@ class bugModel extends model
     {
         $datas = $this->dao->select('pri AS name, COUNT(*) AS value')->from(TABLE_BUG)->where($this->reportCondition())->groupBy('name')->orderBy('value DESC')->fetchAll('name');
         if(!$datas) return array();
-        foreach($datas as $status => $data) $data->name = $this->lang->bug->report->bugsPerPri->graph->xAxisName . ':' . $data->name;
+        foreach($datas as $status => $data) $data->name = $this->lang->bug->report->bugsPerPri->graph->xAxisName . ':' . zget($this->lang->bug->priList, $data->name);
         return $datas;
     }
 

From 1a1321e57c98eee906d9ec99d93c3129f893e97d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <memory@lvtao.net>
Date: Mon, 4 Dec 2017 15:57:37 +0800
Subject: [PATCH 38/40] * Fix bug

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

diff --git a/module/task/model.php b/module/task/model.php
index 6104e258bb..073da42705 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1221,6 +1221,8 @@ class taskModel extends model
 
         $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'task', ($productID or $type == 'needconfirm') ? false : true);
 
+        if(empty($tasks)) return array();
+
         $taskList = array_keys($tasks);
         $taskTeam = $this->dao->select('*')->from(TABLE_TEAM)->where('task')->in($taskList)->fetchGroup('task');
         foreach($taskTeam as $taskID => $team) $tasks[$taskID]->team = $team;

From e8e24b91096ce88f9aabae6d470d2536361ebc8c Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 4 Dec 2017 16:37:35 +0800
Subject: [PATCH 39/40]  * fix for datatable check.

---
 module/common/view/datatable.html.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/module/common/view/datatable.html.php b/module/common/view/datatable.html.php
index 391161bf2e..8306102b1b 100644
--- a/module/common/view/datatable.html.php
+++ b/module/common/view/datatable.html.php
@@ -59,15 +59,7 @@ $(document).ready(function()
                 var $target = $(e.target);
                 if ($target.closest('.task-toggle').length) return false;
                 var $checkRow = $target.closest('.check-row, .check-btn');
-                if($checkRow.length)
-                {
-                    if($checkRow.is('.check-row'))
-                    {
-                        toggleRowClass($checkRow);
-                        syncChecks();
-                    }
-                    return false;
-                }
+                if($checkRow.length) return true;
             },
             startDrag: function(e)
             {

From 2d65d4a222bd0ff578986c861a614836baf6707d Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 4 Dec 2017 16:45:16 +0800
Subject: [PATCH 40/40]  * change for zh-tw and upgrade.

---
 VERSION                       |  2 +-
 config/config.php             |  2 +-
 module/report/lang/zh-tw.php  |  4 +++-
 module/todo/lang/zh-tw.php    | 12 +++++++-----
 module/upgrade/lang/en.php    |  1 +
 module/upgrade/lang/zh-cn.php |  1 +
 module/upgrade/lang/zh-tw.php |  1 +
 tools/check.php               | 23 ++++++++++++++++++++++-
 8 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/VERSION b/VERSION
index c266afa36d..d1c0682f9d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-9.6.2
+9.6.3
diff --git a/config/config.php b/config/config.php
index cbc3fec152..bba0e05875 100644
--- a/config/config.php
+++ b/config/config.php
@@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}}
 if(!function_exists('getWebRoot')){function getWebRoot(){}}
 
 /* 基本设置。Basic settings. */
-$config->version    = '9.6.2';                // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
+$config->version    = '9.6.3';                // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
 $config->charset    = 'UTF-8';              // ZenTaoPHP的编码。 The encoding of ZenTaoPHP.
 $config->cookieLife = time() + 2592000;     // Cookie的生存时间。The cookie life time.
 $config->timezone   = 'Asia/Shanghai';      // 时区设置。        The time zone setting, for more see http://www.php.net/manual/en/timezones.php.
diff --git a/module/report/lang/zh-tw.php b/module/report/lang/zh-tw.php
index f9cecd1959..051651dfd8 100644
--- a/module/report/lang/zh-tw.php
+++ b/module/report/lang/zh-tw.php
@@ -16,6 +16,7 @@ $lang->report->item       = '條目';
 $lang->report->value      = '值';
 $lang->report->percent    = '百分比';
 $lang->report->undefined  = '未設定';
+$lang->report->query      = '查詢';
 
 $lang->report->colors[]   = 'AFD8F8';
 $lang->report->colors[]   = 'F6BD0F';
@@ -42,6 +43,7 @@ $lang->report->bugOpenedDate    = 'Bug創建時間';
 $lang->report->taskAssignedDate = '起止時間';
 $lang->report->beginAndEnd      = '起止時間';
 $lang->report->dept             = '部門';
+$lang->report->deviationChart   = $lang->projectCommon . '偏差曲綫';
 
 $lang->reportList->project->lists[10] = $lang->projectCommon . '偏差報表|report|projectdeviation';
 $lang->reportList->product->lists[10] = $lang->productCommon . '彙總表|report|productsummary';
@@ -53,7 +55,7 @@ $lang->report->id            = '編號';
 $lang->report->project       = $lang->projectCommon;
 $lang->report->product       = $lang->productCommon;
 $lang->report->user          = '姓名';
-$lang->report->bug           = 'Bug';
+$lang->report->bugTotal      = 'Bug';
 $lang->report->task          = '任務數';
 $lang->report->estimate      = '總預計';
 $lang->report->consumed      = '總消耗';
diff --git a/module/todo/lang/zh-tw.php b/module/todo/lang/zh-tw.php
index e879c8a019..870ce07b48 100644
--- a/module/todo/lang/zh-tw.php
+++ b/module/todo/lang/zh-tw.php
@@ -44,9 +44,9 @@ $lang->todo->confirmBug   = '該Todo關聯的是Bug #%s，需要修改它嗎？'
 $lang->todo->confirmTask  = '該Todo關聯的是Task #%s，需要修改它嗎？';
 $lang->todo->confirmStory = '該Todo關聯的是Story #%s，需要修改它嗎？';
 
-$lang->todo->statusList['wait']     = '未開始';
-$lang->todo->statusList['doing']    = '進行中';
-$lang->todo->statusList['done']     = '已完成';
+$lang->todo->statusList['wait']  = '未開始';
+$lang->todo->statusList['doing'] = '進行中';
+$lang->todo->statusList['done']  = '已完成';
 //$lang->todo->statusList['cancel']   = '已取消';
 //$lang->todo->statusList['postpone'] = '已延期';
 
@@ -54,10 +54,12 @@ $lang->todo->priList[3] = '一般';
 $lang->todo->priList[1] = '最高';
 $lang->todo->priList[2] = '較高';
 $lang->todo->priList[4] = '最低';
+$lang->todo->priList[0] = '';
 
 $lang->todo->typeList['custom'] = '自定義';
 $lang->todo->typeList['bug']    = 'Bug';
 $lang->todo->typeList['task']   = $lang->projectCommon . '任務';
+$lang->todo->typeList['story']  = $lang->projectCommon . '需求';
 
 global $config;
 if($config->global->flow == 'onlyTest' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['task']);
@@ -81,5 +83,5 @@ $lang->todo->periods['before']     = '未完';
 $lang->todo->periods['all']        = '所有';
 
 $lang->todo->action = new stdclass();
-$lang->todo->action->finished  = array('main' => '$date, 由 <strong>$actor</strong>完成');
-$lang->todo->action->marked    = array('main' => '$date, 由 <strong>$actor</strong> 標記為<strong>$extra</strong>。', 'extra' => 'statusList');
+$lang->todo->action->finished = array('main' => '$date, 由 <strong>$actor</strong>完成');
+$lang->todo->action->marked   = array('main' => '$date, 由 <strong>$actor</strong> 標記為<strong>$extra</strong>。', 'extra' => 'statusList');
diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php
index ffb8002024..84a645e2f5 100644
--- a/module/upgrade/lang/en.php
+++ b/module/upgrade/lang/en.php
@@ -128,3 +128,4 @@ $lang->upgrade->fromVersions['9_5']       = '9.5';
 $lang->upgrade->fromVersions['9_5_1']     = '9.5.1';
 $lang->upgrade->fromVersions['9_6']       = '9.6';
 $lang->upgrade->fromVersions['9_6_1']     = '9.6.1';
+$lang->upgrade->fromVersions['9_6_2']     = '9.6.2';
diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php
index 04e6511dc7..cfbc9a4ab8 100644
--- a/module/upgrade/lang/zh-cn.php
+++ b/module/upgrade/lang/zh-cn.php
@@ -128,3 +128,4 @@ $lang->upgrade->fromVersions['9_5']       = '9.5';
 $lang->upgrade->fromVersions['9_5_1']     = '9.5.1';
 $lang->upgrade->fromVersions['9_6']       = '9.6';
 $lang->upgrade->fromVersions['9_6_1']     = '9.6.1';
+$lang->upgrade->fromVersions['9_6_2']     = '9.6.2';
diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php
index 389346f9bc..7da01c03ea 100644
--- a/module/upgrade/lang/zh-tw.php
+++ b/module/upgrade/lang/zh-tw.php
@@ -128,3 +128,4 @@ $lang->upgrade->fromVersions['9_5']       = '9.5';
 $lang->upgrade->fromVersions['9_5_1']     = '9.5.1';
 $lang->upgrade->fromVersions['9_6']       = '9.6';
 $lang->upgrade->fromVersions['9_6_1']     = '9.6.1';
+$lang->upgrade->fromVersions['9_6_2']     = '9.6.2';
diff --git a/tools/check.php b/tools/check.php
index 419e1eb2cc..d0b398aba4 100755
--- a/tools/check.php
+++ b/tools/check.php
@@ -91,7 +91,28 @@ $whiteList[] = 'testsuite-library';
 $whiteList[] = 'testsuite-createlib';
 $whiteList[] = 'testsuite-createcase';
 $whiteList[] = 'testsuite-libview';
-
+$whiteList[] = 'admin-log';
+$whiteList[] = 'admin-deletelog';
+$whiteList[] = 'custom-required';
+$whiteList[] = 'custom-score';
+$whiteList[] = 'custom-resetrequired';
+$whiteList[] = 'entry-browse';
+$whiteList[] = 'entry-create';
+$whiteList[] = 'entry-edit';
+$whiteList[] = 'entry-delete';
+$whiteList[] = 'entry-log';
+$whiteList[] = 'score-rule';
+$whiteList[] = 'score-reset';
+$whiteList[] = 'testsuite-batchcreatecase';
+$whiteList[] = 'testsuite-exporttemplet';
+$whiteList[] = 'testsuite-import';
+$whiteList[] = 'testsuite-showimport';
+$whiteList[] = 'webhook-browse';
+$whiteList[] = 'webhook-create';
+$whiteList[] = 'webhook-edit';
+$whiteList[] = 'webhook-delete';
+$whiteList[] = 'webhook-log';
+$whiteList[] = 'webhook-asyncsend';
 
 /* checking actions of every module. */
 echo '-------------action checking-----------------' . "\n";