From 263153b6c87e7ca6f47b9965c68bcbba995e43cb Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Thu, 15 Nov 2018 11:19:33 +0800
Subject: [PATCH 1/5]  * Adjust for task #5126.

---
 module/build/control.php     | 2 +-
 module/build/js/common.js    | 2 --
 module/testtask/js/create.js | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/module/build/control.php b/module/build/control.php
index 28a90984dc..eb7dd0d8b6 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -25,7 +25,7 @@ class build extends control
             $buildID = $this->build->create($projectID);
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
             $this->loadModel('action')->create('build', $buildID, 'opened');
-            if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => 'loadBuildsFormParentPage'));//Code for task #5126.
+            if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.loadProjectBuilds($projectID)"));//Code for task #5126.
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('build', 'view', "buildID=$buildID")));
         }
 
diff --git a/module/build/js/common.js b/module/build/js/common.js
index b8475017da..6e672a87da 100644
--- a/module/build/js/common.js
+++ b/module/build/js/common.js
@@ -18,5 +18,3 @@ function loadBranches(productID)
         }
     });
 }
-
-window.loadBuildsFormParentPage = function(){window.parent.loadProjectBuilds(0);}; //Code for task #5126.
diff --git a/module/testtask/js/create.js b/module/testtask/js/create.js
index 4d9fb925d4..ae1a8ceb76 100755
--- a/module/testtask/js/create.js
+++ b/module/testtask/js/create.js
@@ -19,8 +19,6 @@ function loadProjectRelated(projectID)
  */
 function loadProjectBuilds(projectID)
 {
-    if(!projectID) projectID = $('#project').val();
-
     selectedBuild = $('#build').val();
     if(!selectedBuild) selectedBuild = 0;
     link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + $('#product').val() + '&varName=testTaskBuild&build=' + selectedBuild);

From f1db7cd1a8e0d6909fa1f012e14e7141a4e8f9bf Mon Sep 17 00:00:00 2001
From: Yagami <sgm0422@qq.com>
Date: Thu, 15 Nov 2018 13:09:05 +0800
Subject: [PATCH 2/5] * Finish task #5114.

---
 module/productplan/css/view.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/productplan/css/view.css b/module/productplan/css/view.css
index edfc610213..43a932ab75 100644
--- a/module/productplan/css/view.css
+++ b/module/productplan/css/view.css
@@ -21,3 +21,4 @@
 #unlinkStoryList, #unlinkBugList {border-top: 1px solid #cbd0db;}
 .fixed-footer .text{color:#fff}
 ol, ul { padding-left: 20px; }
+#tabsNav .tab-pane>.main-table{border-radius: 0;}

From c4e1908371524eb2aca013dcb2cccac41abff92d Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 15 Nov 2018 13:32:54 +0800
Subject: [PATCH 3/5]  * adjust for backup.

---
 module/backup/control.php | 1 -
 module/backup/js/index.js | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/backup/control.php b/module/backup/control.php
index 4526eda977..a6460f7caa 100644
--- a/module/backup/control.php
+++ b/module/backup/control.php
@@ -177,7 +177,6 @@ class backup extends control
 
         if($reload == 'yes')
         {
-            echo js::alert($this->lang->backup->success->backup);
             die(js::reload('parent'));
         }
         else
diff --git a/module/backup/js/index.js b/module/backup/js/index.js
index 941ea35e19..4fc094c196 100644
--- a/module/backup/js/index.js
+++ b/module/backup/js/index.js
@@ -15,6 +15,7 @@ $(function()
     $('.rmPHPHeader').click(function()
     {
         $('#waitting .modal-body #backupType').html(rmPHPHeader);
+        $('#waitting .modal-content #message').hide();
         $('#waitting').modal('show');
     })
 
@@ -26,6 +27,7 @@ $(function()
             if(result)
             {
                 $('#waitting .modal-body #backupType').html(restore);
+                $('#waitting .modal-content #message').hide();
                 $('#waitting').modal('show');
 
                 $.getJSON(url, function(response)

From 48f425f1806d52106378e2e1c0a017273b070be9 Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Thu, 15 Nov 2018 13:43:28 +0800
Subject: [PATCH 4/5]  * Finish task #5128.

---
 module/bug/view/browse.html.php          |  8 +++----
 module/product/view/browse.html.php      |  7 +++---
 module/project/view/grouptask.html.php   | 21 ++++++++++--------
 module/project/view/kanban.html.php      |  4 ++--
 module/project/view/task.html.php        | 21 ++++++++++--------
 module/project/view/tree.html.php        |  4 ++--
 module/testcase/view/caseheader.html.php | 28 ++++++++++++++----------
 7 files changed, 52 insertions(+), 41 deletions(-)

diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index b0a4281607..812b3dcf19 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -122,19 +122,19 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
   </div>
   <div class="btn-toolbar pull-right">
     <?php common::printIcon('bug', 'report', "productID=$productID&browseType=$browseType&branchID=$branch&moduleID=$moduleID", '', 'button', 'bar-chart muted');?>
-    <?php if(common::hasPriv('bug', 'export')):?>
     <div class='btn-group'>
       <button type='button' class='btn btn-link dropdown-toggle' data-toggle='dropdown'>
         <i class="icon icon-export muted"></i> <span class="text"> <?php echo $lang->export;?></span> <span class="caret"></span></button>
       </button>
       <ul class='dropdown-menu' id='exportActionMenu'>
         <?php
-        $link = $this->createLink('bug', 'export', "productID=$productID&orderBy=$orderBy&browseType=$browseType");
-        echo "<li>" . html::a($link, $lang->bug->export, '', "class='export'") . "</li>";
+        $class = common::hasPriv('bug', 'export') ? "" : "class='disabled'";
+        $misc  = common::hasPriv('bug', 'export') ? "class='export'" : "class='disabled'";
+        $link  = common::hasPriv('bug', 'export') ? $this->createLink('bug', 'export', "productID=$productID&orderBy=$orderBy&browseType=$browseType") : '#';
+        echo "<li $class>" . html::a($link, $lang->bug->export, '', $misc) . "</li>";
         ?>
       </ul>
     </div>
-    <?php endif;?>
     <?php
     common::printLink('bug', 'batchCreate', "productID=$productID&branch=$branch&projectID=0&moduleID=$moduleID", "<i class='icon icon-plus'></i>" . $lang->bug->batchCreate, '', "class='btn btn-secondary'");
     if(commonModel::isTutorialMode())
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index f5a4ad6f79..28dbacefa2 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -96,9 +96,10 @@
       <button class="btn btn-link" data-toggle="dropdown"><i class="icon icon-export muted"></i> <span class="text"><?php echo $lang->export ?></span> <span class="caret"></span></button>
       <ul class="dropdown-menu" id='exportActionMenu'>
         <?php
-        $misc = common::hasPriv('story', 'export') ? "class='export'" : "class=disabled";
-        $link = common::hasPriv('story', 'export') ?  $this->createLink('story', 'export', "productID=$productID&orderBy=$orderBy&projectID=0&browseType=$browseType") : '#';
-        echo "<li>" . html::a($link, $lang->story->export, '', $misc) . "</li>";
+        $class = common::hasPriv('story', 'export') ? '' : "class=disabled";
+        $misc  = common::hasPriv('story', 'export') ? "class='export'" : "class=disabled";
+        $link  = common::hasPriv('story', 'export') ?  $this->createLink('story', 'export', "productID=$productID&orderBy=$orderBy&projectID=0&browseType=$browseType") : '#';
+        echo "<li $class>" . html::a($link, $lang->story->export, '', $misc) . "</li>";
         ?>
       </ul>
     </div>
diff --git a/module/project/view/grouptask.html.php b/module/project/view/grouptask.html.php
index 453c19152e..c5af58f1f6 100644
--- a/module/project/view/grouptask.html.php
+++ b/module/project/view/grouptask.html.php
@@ -46,9 +46,10 @@
       <button class="btn btn-link" data-toggle="dropdown"><i class="icon icon-export muted"></i> <span class="text"><?php echo $lang->export;?></span> <span class="caret"></span></button>
       <ul class="dropdown-menu">
         <?php
-        $misc = common::hasPriv('task', 'export') ? "class='export'" : "class=disabled";
-        $link = common::hasPriv('task', 'export') ? $this->createLink('task', 'export', "project=$projectID&orderBy=$orderBy&type=$browseType") : '#';
-        echo "<li>" . html::a($link, $lang->story->export, '', $misc) . "</li>";
+        $class = common::hasPriv('task', 'export') ? '' : "class=disabled";
+        $misc  = common::hasPriv('task', 'export') ? "class='export'" : "class=disabled";
+        $link  = common::hasPriv('task', 'export') ? $this->createLink('task', 'export', "project=$projectID&orderBy=$orderBy&type=$browseType") : '#';
+        echo "<li $class>" . html::a($link, $lang->story->export, '', $misc) . "</li>";
         ?>
       </ul>
     </div>
@@ -56,13 +57,15 @@
       <button class="btn btn-link" data-toggle="dropdown"><i class="icon icon-import muted"></i> <span class="text"><?php echo $lang->import;?></span> <span class="caret"></span></button>
       <ul class="dropdown-menu">
         <?php
-        $misc = common::hasPriv('project', 'importTask') ? "class='import'" : "class=disabled";
-        $link = common::hasPriv('project', 'importTask') ? $this->createLink('project', 'importTask', "project=$project->id") : '#';
-        echo "<li>" . html::a($link, $lang->project->importTask, '', $misc) . "</li>";
+        $class = common::hasPriv('project', 'importTask') ? '' : "class=disabled";
+        $misc  = common::hasPriv('project', 'importTask') ? "class='import'" : "class=disabled";
+        $link  = common::hasPriv('project', 'importTask') ? $this->createLink('project', 'importTask', "project=$project->id") : '#';
+        echo "<li $class>" . html::a($link, $lang->project->importTask, '', $misc) . "</li>";
 
-        $misc = common::hasPriv('project', 'importBug') ? "class='import'" : "class=disabled";
-        $link = common::hasPriv('project', 'importBug') ? $this->createLink('project', 'importBug', "project=$project->id") : '#';
-        echo "<li>" . html::a($link, $lang->project->importBug, '', $misc) . "</li>";
+        $class = common::hasPriv('project', 'importBug') ? '' : "class=disabled";
+        $misc  = common::hasPriv('project', 'importBug') ? "class='import'" : "class=disabled";
+        $link  = common::hasPriv('project', 'importBug') ? $this->createLink('project', 'importBug', "project=$project->id") : '#';
+        echo "<li $class>" . html::a($link, $lang->project->importBug, '', $misc) . "</li>";
         ?>
       </ul>
     </div>
diff --git a/module/project/view/kanban.html.php b/module/project/view/kanban.html.php
index 8a530afb40..30ee650cce 100644
--- a/module/project/view/kanban.html.php
+++ b/module/project/view/kanban.html.php
@@ -26,11 +26,11 @@
         <?php
         $misc = common::hasPriv('project', 'importTask') ? '' : "class=disabled";
         $link = common::hasPriv('project', 'importTask') ?  $this->createLink('project', 'importTask', "project=$project->id") : '#';
-        echo "<li>" . html::a($link, $lang->project->importTask, '', $misc) . "</li>";
+        echo "<li $misc>" . html::a($link, $lang->project->importTask, '', $misc) . "</li>";
 
         $misc = common::hasPriv('project', 'importBug') ? '' : "class=disabled";
         $link = common::hasPriv('project', 'importBug') ?  $this->createLink('project', 'importBug', "project=$project->id") : '#';
-        echo "<li>" . html::a($link, $lang->project->importBug, '', $misc) . "</li>";
+        echo "<li $misc>" . html::a($link, $lang->project->importBug, '', $misc) . "</li>";
         ?>
       </ul>
     </div>
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index 2dee532eaa..59b0ab256f 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -122,9 +122,10 @@ js::set('browseType', $browseType);
       <button class="btn btn-link" data-toggle="dropdown"><i class="icon icon-export muted"></i> <span class="text"><?php echo $lang->export;?></span> <span class="caret"></span></button>
       <ul class="dropdown-menu pull-right" id='exportActionMenu'>
         <?php
-        $misc = common::hasPriv('task', 'export') ? "class='export'" : "class=disabled";
-        $link = common::hasPriv('task', 'export') ? $this->createLink('task', 'export', "project=$projectID&orderBy=$orderBy&type=$browseType") : '#';
-        echo "<li>" . html::a($link, $lang->story->export, '', $misc) . "</li>";
+        $class = common::hasPriv('task', 'export') ? '' : "class=disabled";
+        $misc  = common::hasPriv('task', 'export') ? "class='export'" : "class=disabled";
+        $link  = common::hasPriv('task', 'export') ? $this->createLink('task', 'export', "project=$projectID&orderBy=$orderBy&type=$browseType") : '#';
+        echo "<li $class>" . html::a($link, $lang->story->export, '', $misc) . "</li>";
         ?>
       </ul>
     </div>
@@ -133,13 +134,15 @@ js::set('browseType', $browseType);
       <button class="btn btn-link" data-toggle="dropdown"><i class="icon icon-import muted"></i> <span class="text"><?php echo $lang->import;?></span> <span class="caret"></span></button>
       <ul class="dropdown-menu pull-right" id='importActionMenu'>
         <?php
-        $misc = common::hasPriv('project', 'importTask') ? "class='import'" : "class=disabled";
-        $link = common::hasPriv('project', 'importTask') ? $this->createLink('project', 'importTask', "project=$project->id") : '#';
-        echo "<li>" . html::a($link, $lang->project->importTask, '', $misc) . "</li>";
+        $class = common::hasPriv('project', 'importTask') ? '' : "class=disabled";
+        $misc  = common::hasPriv('project', 'importTask') ? "class='import'" : "class=disabled";
+        $link  = common::hasPriv('project', 'importTask') ? $this->createLink('project', 'importTask', "project=$project->id") : '#';
+        echo "<li $class>" . html::a($link, $lang->project->importTask, '', $misc) . "</li>";
 
-        $misc = common::hasPriv('project', 'importBug') ? "class='import'" : "class=disabled";
-        $link = common::hasPriv('project', 'importBug') ? $this->createLink('project', 'importBug', "project=$project->id") : '#';
-        echo "<li>" . html::a($link, $lang->project->importBug, '', $misc) . "</li>";
+        $class = common::hasPriv('project', 'importBug') ? '' : "class=disabled";
+        $misc  = common::hasPriv('project', 'importBug') ? "class='import'" : "class=disabled";
+        $link  = common::hasPriv('project', 'importBug') ? $this->createLink('project', 'importBug', "project=$project->id") : '#';
+        echo "<li $class>" . html::a($link, $lang->project->importBug, '', $misc) . "</li>";
         ?>
       </ul>
     </div>
diff --git a/module/project/view/tree.html.php b/module/project/view/tree.html.php
index 1b5a6f1a71..c80a212363 100644
--- a/module/project/view/tree.html.php
+++ b/module/project/view/tree.html.php
@@ -38,11 +38,11 @@
         <?php
         $misc = common::hasPriv('project', 'importTask') ? '' : "class=disabled";
         $link = common::hasPriv('project', 'importTask') ?  $this->createLink('project', 'importTask', "project=$project->id") : '#';
-        echo "<li>" . html::a($link, $lang->project->importTask, '', $misc) . "</li>";
+        echo "<li $misc>" . html::a($link, $lang->project->importTask, '', $misc) . "</li>";
 
         $misc = common::hasPriv('project', 'importBug') ? '' : "class=disabled";
         $link = common::hasPriv('project', 'importBug') ?  $this->createLink('project', 'importBug', "project=$project->id") : '#';
-        echo "<li>" . html::a($link, $lang->project->importBug, '', $misc) . "</li>";
+        echo "<li $misc>" . html::a($link, $lang->project->importBug, '', $misc) . "</li>";
         ?>
       </ul>
     </div>
diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php
index 6a24c0ac48..5e7d41e261 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -124,13 +124,15 @@
       </button>
       <ul class='dropdown-menu' id='exportActionMenu'>
       <?php
-      $misc = common::hasPriv('testcase', 'export') ? "class='export'" : "class=disabled";
-      $link = common::hasPriv('testcase', 'export') ?  $this->createLink('testcase', 'export', "productID=$productID&orderBy=$orderBy&taskID=0&browseType=$browseType") : '#';
-      echo "<li>" . html::a($link, $lang->testcase->export, '', $misc) . "</li>";
+      $class = common::hasPriv('testcase', 'export') ? '' : "class=disabled";
+      $misc  = common::hasPriv('testcase', 'export') ? "class='export'" : "class=disabled";
+      $link  = common::hasPriv('testcase', 'export') ?  $this->createLink('testcase', 'export', "productID=$productID&orderBy=$orderBy&taskID=0&browseType=$browseType") : '#';
+      echo "<li $class>" . html::a($link, $lang->testcase->export, '', $misc) . "</li>";
 
-      $misc = common::hasPriv('testcase', 'exportTemplet') ? "class='export'" : "class=disabled";
-      $link = common::hasPriv('testcase', 'exportTemplet') ?  $this->createLink('testcase', 'exportTemplet', "productID=$productID") : '#';
-      echo "<li>" . html::a($link, $lang->testcase->exportTemplet, '', $misc) . "</li>";
+      $class = common::hasPriv('testcase', 'exportTemplet') ? '' : "class=disabled";
+      $misc  = common::hasPriv('testcase', 'exportTemplet') ? "class='export'" : "class=disabled";
+      $link  = common::hasPriv('testcase', 'exportTemplet') ?  $this->createLink('testcase', 'exportTemplet', "productID=$productID") : '#';
+      echo "<li $class>" . html::a($link, $lang->testcase->exportTemplet, '', $misc) . "</li>";
       ?>
       </ul>
     </div>
@@ -138,13 +140,15 @@
       <button type='button' class='btn btn-link dropdown-toggle' data-toggle='dropdown' id='importAction'><i class='icon icon-import muted'></i> <?php echo $lang->import ?><span class='caret'></span></button>
       <ul class='dropdown-menu' id='importActionMenu'>
       <?php
-      $misc = common::hasPriv('testcase', 'import') ? "class='export'" : "class=disabled";
-      $link = common::hasPriv('testcase', 'import') ?  $this->createLink('testcase', 'import', "productID=$productID&branch=$branch") : '#';
-      echo "<li>" . html::a($link, $lang->testcase->importFile, '', $misc) . "</li>";
+      $class = common::hasPriv('testcase', 'import') ? '' : "class=disabled";
+      $misc  = common::hasPriv('testcase', 'import') ? "class='export'" : "class=disabled";
+      $link  = common::hasPriv('testcase', 'import') ?  $this->createLink('testcase', 'import', "productID=$productID&branch=$branch") : '#';
+      echo "<li $class>" . html::a($link, $lang->testcase->importFile, '', $misc) . "</li>";
 
-      $misc = common::hasPriv('testcase', 'importFromLib') ? '' : "class=disabled";
-      $link = common::hasPriv('testcase', 'importFromLib') ?  $this->createLink('testcase', 'importFromLib', "productID=$productID&branch=$branch") : '#';
-      echo "<li>" . html::a($link, $lang->testcase->importFromLib, '', $misc) . "</li>";
+      $class = common::hasPriv('testcase', 'importFromLib') ? '' : "class=disabled";
+      $misc  = common::hasPriv('testcase', 'importFromLib') ? '' : "class=disabled";
+      $link  = common::hasPriv('testcase', 'importFromLib') ?  $this->createLink('testcase', 'importFromLib', "productID=$productID&branch=$branch") : '#';
+      echo "<li $class>" . html::a($link, $lang->testcase->importFromLib, '', $misc) . "</li>";
       ?>
       </ul>
     </div>

From 1650ba3592eb0695ec698a96a5c49e4086f473d5 Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Thu, 15 Nov 2018 14:10:27 +0800
Subject: [PATCH 5/5]  * Finish task #5129.

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

diff --git a/module/group/model.php b/module/group/model.php
index a55babf18f..f51cdb441e 100644
--- a/module/group/model.php
+++ b/module/group/model.php
@@ -306,9 +306,10 @@ class groupModel extends model
      */
     public function updateUser($groupID)
     {
+        $members    = $this->post->members ? $this->post->members : array();
         $groupUsers = $this->dao->select('account')->from(TABLE_USERGROUP)->where('`group`')->eq($groupID)->fetchPairs('account');
-        $newUsers   = array_diff($this->post->members, $groupUsers);
-        $delUsers   = array_diff($groupUsers, $this->post->members);
+        $newUsers   = array_diff($members, $groupUsers);
+        $delUsers   = array_diff($groupUsers, $members);
 
         $this->dao->delete()->from(TABLE_USERGROUP)->where('`group`')->eq($groupID)->andWhere('account')->in($delUsers)->exec();