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

module/action/lang/en.php

@@ -83,6 +83,7 @@ $lang->action->desc->undeleted      = '$date, restored by <strong>$actor</strong
 $lang->action->desc->hidden         = '$date, hidden by <strong>$actor</strong> .' . "\n";
 $lang->action->desc->commented      = '$date, added by <strong>$actor</strong>.' . "\n";
 $lang->action->desc->activated      = '$date, activated by <strong>$actor</strong> .' . "\n";
+$lang->action->desc->blocked        = '$date, blocked by <strong>$actor</strong> .' . "\n";
 $lang->action->desc->moved          = '$date, moved by <strong>$actor</strong> , which was "$extra".' . "\n";
 $lang->action->desc->confirmed      = '$date, <strong>$actor</strong> confirmed the change of Story. The latest version is <strong>#$extra</strong>.' . "\n";
 $lang->action->desc->caseconfirmed  = '$date, <strong>$actor</strong> confirmed the change of Case. The latest version is <strong>#$extra</strong>' . "\n";
@@ -124,6 +125,7 @@ $lang->action->label->undeleted           = 'Restored';
 $lang->action->label->hidden              = 'Hidden';
 $lang->action->label->commented           = 'Commented';
 $lang->action->label->activated           = 'Activated';
+$lang->action->label->blocked             = 'Blocked';
 $lang->action->label->resolved            = 'Resolved';
 $lang->action->label->reviewed            = 'Reviewed';
 $lang->action->label->moved               = 'Moved';
@@ -218,6 +220,7 @@ $lang->action->search->label['undeleted']           = $lang->action->label->unde
 $lang->action->search->label['hidden']              = $lang->action->label->hidden;
 $lang->action->search->label['commented']           = $lang->action->label->commented;
 $lang->action->search->label['activated']           = $lang->action->label->activated;
+$lang->action->search->label['blocked']             = $lang->action->label->blocked;
 $lang->action->search->label['resolved']            = $lang->action->label->resolved;
 $lang->action->search->label['reviewed']            = $lang->action->label->reviewed;
 $lang->action->search->label['moved']               = $lang->action->label->moved;

module/action/lang/zh-cn.php

@@ -83,6 +83,7 @@ $lang->action->desc->undeleted      = '$date, 由 <strong>$actor</strong> 还原
 $lang->action->desc->hidden         = '$date, 由 <strong>$actor</strong> 隐藏。' . "\n";
 $lang->action->desc->commented      = '$date, 由 <strong>$actor</strong> 添加备注。' . "\n";
 $lang->action->desc->activated      = '$date, 由 <strong>$actor</strong> 激活。' . "\n";
+$lang->action->desc->blocked        = '$date, 由 <strong>$actor</strong> 阻塞。' . "\n";
 $lang->action->desc->moved          = '$date, 由 <strong>$actor</strong> 移动，之前为 "$extra"。' . "\n";
 $lang->action->desc->confirmed      = '$date, 由 <strong>$actor</strong> 确认需求变动，最新版本为<strong>#$extra</strong>。' . "\n";
 $lang->action->desc->caseconfirmed  = '$date, 由 <strong>$actor</strong> 确认用例变动，最新版本为<strong>#$extra</strong>。' . "\n";
@@ -124,6 +125,7 @@ $lang->action->label->undeleted           = '还原了';
 $lang->action->label->hidden              = '隐藏了';
 $lang->action->label->commented           = '评论了';
 $lang->action->label->activated           = '激活了';
+$lang->action->label->blocked             = '阻塞了';
 $lang->action->label->resolved            = '解决了';
 $lang->action->label->reviewed            = '评审了';
 $lang->action->label->moved               = '移动了';
@@ -219,6 +221,7 @@ $lang->action->search->label['undeleted']           = $lang->action->label->unde
 $lang->action->search->label['hidden']              = $lang->action->label->hidden;
 $lang->action->search->label['commented']           = $lang->action->label->commented;
 $lang->action->search->label['activated']           = $lang->action->label->activated;
+$lang->action->search->label['blocked']             = $lang->action->label->blocked;
 $lang->action->search->label['resolved']            = $lang->action->label->resolved;
 $lang->action->search->label['reviewed']            = $lang->action->label->reviewed;
 $lang->action->search->label['moved']               = $lang->action->label->moved;

module/testtask/control.php

@@ -455,7 +455,7 @@ class testtask extends control
 
             if($this->post->comment != '' or !empty($changes))
             {
-                $actionID = $this->action->create('testtask', $taskID, 'Doinged', $this->post->comment);
+                $actionID = $this->action->create('testtask', $taskID, 'Activated', $this->post->comment);
                 $this->action->logHistory($actionID, $changes);
             }
 

module/testtask/js/edit.js

@@ -24,3 +24,15 @@ function loadProjectBuilds(projectID)
     link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + $('#product').val() + '&varName=testTaskBuild&build=' + selectedBuild);
     $('#buildBox').load(link, function(){$('#build').chosen(defaultChosenOptions);});
 }
+
+$(function()
+{
+    var adjustPriBoxWidth = function()
+    {
+        var boxWidth   = $('#ownerAndPriBox').width();
+        var beginWidth = $("input[name='begin']").outerWidth();
+        var addonWidth = $('#ownerAndPriBox .input-group-addon').outerWidth();
+        $('#pri').css('width', boxWidth - beginWidth -addonWidth);
+    };
+    adjustPriBoxWidth();//Adjust testtask pri box width.
+})

module/testtask/model.php

@@ -896,10 +896,10 @@ class testtaskModel extends model
     {
         $action = strtolower($action);
 
-        if($action == 'start')   return $testtask->status  == 'wait';
-        if($action == 'blocked') return ($testtask->status == 'doing'   || $testtask->status == 'wait');
-        if($action == 'doing')   return ($testtask->status == 'blocked' || $testtask->status == 'done');
-        if($action == 'close')   return $testtask->status != 'done';
+        if($action == 'start')    return $testtask->status  == 'wait';
+        if($action == 'block')    return ($testtask->status == 'doing'   || $testtask->status == 'wait');
+        if($action == 'activate') return ($testtask->status == 'blocked' || $testtask->status == 'done');
+        if($action == 'close')    return $testtask->status != 'done';
 
         return true;
     }

module/testtask/view/close.html.php

@@ -23,10 +23,6 @@
   </div>
   <form class='form-condensed' method='post' target='hiddenwin'>
     <table class='table table-form'>
-      <tr>
-        <th><?php echo $lang->testtask->report;?></th>
-        <td><?php echo html::textarea('report', '', "rows='6' class='form-control'");?></td>
-      </tr>
       <tr>
         <th><?php echo $lang->comment;?></th>
         <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>

module/testtask/view/edit.html.php

@@ -25,7 +25,9 @@
     <table class='table table-form'> 
       <tr>
         <th class='w-80px'><?php echo $lang->testtask->project;?></th>
-        <td class='w-p25-f'><?php echo html::select('project', $projects, $task->project, "class='form-control chosen' onchange='loadProjectRelated(this.value)'");?></td>
+        <td class='w-p35-f'>
+          <?php echo html::select('project', $projects, $task->project, "class='form-control chosen' onchange='loadProjectRelated(this.value)'");?>
+        </td>
         <td><?php echo html::hidden('product', $task->product)?></td>
       </tr>
       <tr>
@@ -34,19 +36,23 @@
       </tr>
       <tr>
         <th><?php echo $lang->testtask->owner;?></th>
-        <td><?php echo html::select('owner', $users, $task->owner, "class='form-control chosen'");?></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->testtask->pri;?></th>
-        <td><?php echo html::select('pri', $lang->testtask->priList, $task->pri, "class='form-control'");?></td>
+        <td>
+          <div id='ownerAndPriBox' class='input-group'>
+            <?php echo html::select('owner', $users, $task->owner, "class='form-control chosen'");?>
+            <span class='input-group-addon fix-border'><?php echo $lang->testtask->pri;?></span>
+            <?php echo html::select('pri', $lang->testtask->priList, $task->pri, "class='form-control'");?>
+          </div>
+        </td>
       </tr>
       <tr>
         <th><?php echo $lang->testtask->begin;?></th>
-        <td><?php echo html::input('begin', $task->begin, "class='form-control form-date'");?></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->testtask->end;?></th>
-        <td><?php echo html::input('end', $task->end, "class='form-control form-date'");?></td>
+        <td>
+          <div class='input-group'>
+            <?php echo html::input('begin', $task->begin, "class='form-control form-date'");?>
+            <span class='input-group-addon fix-border'><?php echo $lang->testtask->end;?></span>
+            <?php echo html::input('end', $task->end, "class='form-control form-date'");?>
+          </div>
+        </td>
       </tr>
       <tr>
         <th><?php echo $lang->testtask->status;?></th>
@@ -60,10 +66,6 @@
         <th><?php echo $lang->testtask->desc;?></th>
         <td colspan='2'><?php echo html::textarea('desc', htmlspecialchars($task->desc), "rows=10 class='form-control'");?></td>
       </tr>
-      <tr>
-        <th><?php echo $lang->testtask->report;?></th>
-        <td colspan='2'><?php echo html::textarea('report', htmlspecialchars($task->report), "rows=10 class='form-control'");?></td>
-      </tr>
       <tr>
         <th><?php echo $lang->testtask->mailto;?></th>
         <td colspan='2'>

module/testtask/view/view.html.php

@@ -60,10 +60,6 @@
         <legend><?php echo $lang->testtask->legendDesc;?></legend>
         <div class='article-content'><?php echo $task->desc;?></div>
       </fieldset>
-      <fieldset>
-        <legend><?php echo $lang->testtask->legendReport;?></legend>
-        <div class='article-content'><?php echo $task->report;?></div>
-      </fieldset>
       <?php include '../../common/view/action.html.php';?>
       <div class='actions'><?php echo $actionLinks;?></div>
     </div>