Merge branch 'master' of github.com:easysoft/zentaopms

module/block/lang/zh-cn.php

@@ -398,7 +398,7 @@ $lang->block->gridOptions[4] = '右侧';
 
 $lang->block->flowchart   = array();
 $lang->block->flowchart['admin']   = array('管理员', '维护公司', '添加用户', '维护权限');
-$lang->block->flowchart['product'] = array($lang->productCommon . '经理', '创建' . $lang->productCommon, '维护模块', '维护计划', '维护{$lang->storyCommon}', '创建发布');
-$lang->block->flowchart['project'] = array($lang->projectCommon . '经理', '创建' . $lang->projectCommon, '维护团队', '关联' . $lang->productCommon, '关联{$lang->storyCommon}', '分解任务');
+$lang->block->flowchart['product'] = array($lang->productCommon . '经理', '创建' . $lang->productCommon, '维护模块', '维护计划', "维护{$lang->storyCommon}", '创建发布');
+$lang->block->flowchart['project'] = array($lang->projectCommon . '经理', '创建' . $lang->projectCommon, '维护团队', '关联' . $lang->productCommon, "关联{$lang->storyCommon}", '分解任务');
 $lang->block->flowchart['dev']     = array('研发人员', '领取任务和Bug', '更新状态', '完成任务和Bug');
 $lang->block->flowchart['tester']  = array('测试人员', '撰写用例', '执行用例', '提交Bug', '验证Bug', '关闭Bug');

module/build/control.php

@@ -346,7 +346,7 @@ class build extends control
             $params = ($type == 'all') ? 'noempty' : 'noempty, noterminate, nodone';
             $builds = $this->build->getProjectBuildPairs($projectID, $productID, $branch, $params, $build);
             if($isJsonView) die(json_encode($builds));
-            else die(html::select($varName . '[]', $builds , $build, 'size=4 class=form-control multiple'));
+            else die(html::select($varName . '[]', $builds , '', 'size=4 class=form-control multiple'));
         }
         if($varName == 'openedBuilds')
         {

module/task/model.php

@@ -2690,7 +2690,7 @@ class taskModel extends model
             case 'name':
                 if($task->parent > 0 and isset($task->parentName)) $task->name = "{$task->parentName} / {$task->name}";
                 if(!empty($task->product) && isset($branchGroups[$task->product][$task->branch])) echo "<span class='label label-info label-outline'>" . $branchGroups[$task->product][$task->branch] . '</span> ';
-                if(empty($task->children) and $task->module and isset($modulePairs[$task->module])) echo "<span class='label label-gray label-badge'>" . $modulePairs[$task->module] . '</span> ';
+                if($task->module and isset($modulePairs[$task->module])) echo "<span class='label label-gray label-badge'>" . $modulePairs[$task->module] . '</span> ';
                 if($task->parent > 0) echo '<span class="label label-badge label-light" title="' . $this->lang->task->children . '">' . $this->lang->task->childrenAB . '</span> ';
                 if(!empty($task->team)) echo '<span class="label label-badge label-light" title="' . $this->lang->task->multiple . '">' . $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>";

module/testcase/control.php

@@ -993,11 +993,12 @@ class testcase extends control
      * @access public
      * @return void
      */
-    public function confirmChange($caseID)
+    public function confirmChange($caseID, $from = 'view')
     {
         $case = $this->testcase->getById($caseID);
         $this->dao->update(TABLE_TESTRUN)->set('version')->eq($case->version)->where('`case`')->eq($caseID)->exec();
-        die(js::locate(inLink('view', "caseID=$caseID"), 'parent'));
+        if($from == 'view') die(js::locate(inLink('view', "caseID=$caseID"), 'parent'));
+        die(js::reload('parent'));
     }
 
     /**

module/testtask/css/cases.css

@@ -10,6 +10,7 @@ tbody > tr > td   .icon-bug {margin-left: -8px;}
 .table-footer .table-actions .input-group #assignedTo_chosen .chosen-single span{font-size:12px;}
 .table-footer .table-actions .input-group #assignedTo_chosen .chosen-single div{line-height:10px;}
 td.c-story{overflow: hidden; text-overflow:ellipsis; white-space: nowrap;}
+td .warning{color: red;}
 
 .fail .result-fail, .blocked .result-blocked{color:#f00;}
 .pass .result-pass{color:green;}

module/testtask/model.php

@@ -1177,10 +1177,11 @@ class testtaskModel extends model
      */
     public function printCell($col, $run, $users, $task, $branches, $mode = 'datatable')
     {
-        $canView  = common::hasPriv('testcase', 'view');
-        $caseLink = helper::createLink('testcase', 'view', "caseID=$run->case&version=$run->version&from=testtask&taskID=$run->task");
-        $account  = $this->app->user->account;
-        $id = $col->id;
+        $canView     = common::hasPriv('testcase', 'view');
+        $caseLink    = helper::createLink('testcase', 'view', "caseID=$run->case&version=$run->version&from=testtask&taskID=$run->task");
+        $account     = $this->app->user->account;
+        $id          = $col->id;
+        $caseChanged = $run->version < $run->caseVersion;
         if($col->show)
         {
             $class = "c-$id ";
@@ -1216,7 +1217,7 @@ class testtaskModel extends model
                 foreach(explode(',', trim($run->stage, ',')) as $stage) echo $this->lang->testcase->stageList[$stage] . '<br />';
                 break;
             case 'status':
-                echo ($run->version < $run->caseVersion) ? "<span class='warning'>{$this->lang->testcase->changed}</span>" : $this->processStatus('testtask', $run);
+                echo $caseChanged ? "<span class='warning'>{$this->lang->testcase->changed}</span>" : $this->processStatus('testtask', $run);
                 break;
             case 'precondition':
                 echo $run->precondition;
@@ -1275,6 +1276,12 @@ class testtaskModel extends model
                 echo $run->stepNumber;
                 break;
             case 'actions':
+                if($caseChanged)
+                {
+                    common::printIcon('testcase', 'confirmChange', "id=$run->case&from=list", $run, 'list', 'search', 'hiddenwin');
+                    break;
+                }
+
                 common::printIcon('testcase', 'createBug', "product=$run->product&branch=$run->branch&extra=projectID=$task->project,buildID=$task->build,caseID=$run->case,version=$run->version,runID=$run->id,testtask=$task->id", $run, 'list', 'bug', '', 'iframe', '', "data-width='90%'");
 
                 common::printIcon('testtask', 'results', "id=$run->id", $run, 'list', '', '', 'iframe', '', "data-width='90%'");