* Update testtask runNode.

module/testcase/model.php

@@ -2080,7 +2080,7 @@ class testcaseModel extends model
                     $showBranch = isset($this->config->testcase->browse->showBranch) ? $this->config->testcase->browse->showBranch : 1;
                 }
 
-                $autoIcon = $case->auto == 'auto' ? " <i class='icon icon-ztf'></i>" : '';
+                $autoIcon = $case->auto == 'auto' ? " <i class='icon icon-draft-edit'></i>" : '';
                 if(isset($branches[$case->branch]) and $showBranch) echo "<span class='label label-outline label-badge'>{$branches[$case->branch]}</span> ";
                 if($modulePairs and $case->module and isset($modulePairs[$case->module])) echo "<span class='label label-gray label-badge'>{$modulePairs[$case->module]}</span> ";
                 echo $canView ? ($fromCaseID ? html::a($caseLink, $case->title, null, "style='color: $case->color' data-app='{$this->app->tab}'") . html::a(helper::createLink('testcase', 'view', "caseID=$fromCaseID"), "[<i class='icon icon-share' title='{$this->lang->testcase->fromCaselib}'></i>#$fromCaseID]" . $autoIcon, '', "data-app='{$this->app->tab}'") : html::a($caseLink, $case->title . $autoIcon, null, "style='color: $case->color' data-app='{$this->app->tab}'")) : "<span style='color: $case->color'>$case->title</span>";

module/testcase/view/caseheader.html.php

@@ -15,6 +15,7 @@
 .body-modal #mainMenu>.btn-toolbar {width: auto;}
 #mainMenu .pull-left .checkbox-primary {margin-top: 5px;}
 #mainMenu .dividing-line {width: 1px; height: 16px; display: inline-block; background: #D8DBDE; margin: 7px 8px 0 0; float: left;}
+#byTypeTab li.split{border-top: 1px solid #eee;}
 </style>
 <div id='mainMenu' class='clearfix'>
   <?php if(!($this->app->rawMethod == 'groupcase')):?>
@@ -71,7 +72,7 @@
 
         echo "<div id='byTypeTab' class='btn-group'>";
         echo html::a('javascript:;', "<span class='text'>{$currentLable}</span>" . " <span class='caret'></span>", '', "class='btn btn-link' data-toggle='dropdown'");
-        echo "<ul class='dropdown-menu' style='max-height:240px; overflow-y:auto; width:120px;'>";
+        echo "<ul class='dropdown-menu' style='max-height:240px; overflow-y:auto; width:130px;'>";
 
         foreach($lang->testcase->typeList as $type => $typeName)
         {
@@ -89,6 +90,7 @@
             echo "</li>";
         }
 
+        echo "<li class='split'></li>";
         echo html::checkbox('showAutoCase', array('1' => $lang->testcase->showAutoCase), '', $this->cookie->showAutoCase ? 'checked=checked' : '');
         echo '</ul></div>';
     }

module/testtask/lang/zh-cn.php

@@ -28,7 +28,7 @@ $lang->testtask->batchAssign      = "批量指派";
 $lang->testtask->runCase          = "执行";
 $lang->testtask->running          = "执行中";
 $lang->testtask->runningLog       = "执行日志";
-$lang->testtask->runNode          = "，在执行节点%s上";
+$lang->testtask->runNode          = "由%s，在执行节点%s上执行";
 $lang->testtask->batchRun         = "批量执行";
 $lang->testtask->results          = "结果";
 $lang->testtask->createBug        = "提Bug";

module/testtask/view/results.html.php

@@ -45,7 +45,11 @@
         <tr class='result-item' data-id='<?php echo $result->id?>' data-status='<?php echo $result->node > 0 && empty($result->ZTFResult) ? 'running': 'ready';?>' id='result-<?php echo $class?>' style='cursor: pointer'>
           <td class='w-120px'> &nbsp; #<?php echo $result->id?></td>
           <td class='w-180px'><?php echo $result->date;?></td>
-          <td><?php echo zget($users, $result->lastRunner) . ' ' . $lang->testtask->runCase . ($result->node > 0 && empty($result->ZTFResult) ? sprintf($lang->testtask->runNode, $result->nodeName):'') . ($result->node > 0 ? "&nbsp;&nbsp;<span class=\"label label-badge\">{$lang->testtask->auto}</span>" : "");?></td>
+          <?php if($result->node > 0):?>
+          <td><?php echo sprintf($lang->testtask->runNode, zget($users, $result->lastRunner), $result->nodeName) . "&nbsp;&nbsp;<span class=\"label label-badge\">{$lang->testtask->auto}</span>";?></td>
+          <?php else:?>
+          <td><?php echo zget($users, $result->lastRunner) . ' ' . $lang->testtask->runCase;?></td>
+          <?php endif;?>
           <td class='w-150px'><?php echo zget($builds, $result->build, '');?></td>
           <td class='w-50px text-right'>
             <?php if($result->node == 0 || !empty($result->ZTFResult)):?>

module/zahost/view/edit.html.php

@@ -31,7 +31,7 @@
           </tr>
           <tr>
             <th><?php echo $lang->zahost->name;?></th>
-            <td><?php echo html::input('name', $host->name, "class='form-control'");?></td>
+            <td><?php echo html::input('name', $host->name, "class='form-control' disabled");?></td>
           </tr>
           <tr>
             <th><?php echo $lang->zahost->IP;?></th>