diff --git a/module/testtask/config.php b/module/testtask/config.php
index 270b424076..e56adeac74 100644
--- a/module/testtask/config.php
+++ b/module/testtask/config.php
@@ -6,11 +6,13 @@ $config->testtask->create->requiredFields = 'project,build,begin,end,name';
 $config->testtask->edit->requiredFields   = 'project,build,begin,end,name';
 
 $config->testtask->editor = new stdclass();
-$config->testtask->editor->create = array('id' => 'desc', 'tools' => 'simpleTools');
-$config->testtask->editor->edit   = array('id' => 'desc,report', 'tools' => 'simpleTools');
-$config->testtask->editor->view   = array('id' => 'lastComment', 'tools' => 'simpleTools');
-$config->testtask->editor->start  = array('id' => 'comment', 'tools' => 'simpleTools');
-$config->testtask->editor->close  = array('id' => 'report,comment', 'tools' => 'simpleTools');
+$config->testtask->editor->create  = array('id' => 'desc', 'tools' => 'simpleTools');
+$config->testtask->editor->edit    = array('id' => 'desc,report', 'tools' => 'simpleTools');
+$config->testtask->editor->view    = array('id' => 'lastComment', 'tools' => 'simpleTools');
+$config->testtask->editor->start   = array('id' => 'comment', 'tools' => 'simpleTools');
+$config->testtask->editor->close   = array('id' => 'report,comment', 'tools' => 'simpleTools');
+$config->testtask->editor->block   = array('id' => 'comment', 'tools' => 'simpleTools');
+$config->testtask->editor->activate= array('id' => 'comment', 'tools' => 'simpleTools');
 
 $config->testtask->datatable = new stdclass();
 $config->testtask->datatable->defaultField = array('id', 'pri', 'title', 'type', 'assignedTo', 'lastRunner', 'lastRunDate', 'lastRunResult', 'status', 'bugs', 'results', 'actions');
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 6164760290..e3c6dbbba2 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -523,19 +523,19 @@ class testtask extends control
     }
 
     /**
-     * Close testtask.
+     * block testtask.
      * 
      * @param  int    $taskID 
      * @access public
      * @return void
      */
-    public function blocked($taskID)
+    public function block($taskID)
     {
         $actions  = $this->loadModel('action')->getList('testtask', $taskID);
 
         if(!empty($_POST))
         {
-            $changes = $this->testtask->blocked($taskID);
+            $changes = $this->testtask->block($taskID);
             if(dao::isError()) die(js::error(dao::getError()));
 
             if($this->post->comment != '' or !empty($changes))
@@ -558,7 +558,7 @@ class testtask extends control
         $this->view->testtask   = $testtask;
         $this->view->title      = $testtask->name . $this->lang->colon . $this->lang->testtask->start;
         $this->view->position[] = $this->lang->testtask->common;
-        $this->view->position[] = $this->lang->testtask->blocked;
+        $this->view->position[] = $this->lang->testtask->block;
         $this->view->actions    = $actions;
         $this->display();
     }
diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index dc7914ea12..ffa375e9fe 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -32,7 +32,7 @@ $lang->testtask->next             = '下一个';
 $lang->testtask->start            = "开始";
 $lang->testtask->close            = "关闭";
 $lang->testtask->wait             = "待测版本";
-$lang->testtask->blocked          = "阻塞";
+$lang->testtask->block            = "阻塞";
 $lang->testtask->activate         = "激活";
 $lang->testtask->testing          = "测试中版本";
 $lang->testtask->blockedA         = "被阻塞版本";
diff --git a/module/testtask/view/doing.html.php b/module/testtask/view/activate.html.php
similarity index 92%
rename from module/testtask/view/doing.html.php
rename to module/testtask/view/activate.html.php
index a85479b10d..20ee5fe6d5 100644
--- a/module/testtask/view/doing.html.php
+++ b/module/testtask/view/activate.html.php
@@ -18,7 +18,7 @@
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['testtask']);?> <strong><?php echo $testtask->id;?></strong></span>
       <strong><?php echo html::a($this->createLink('testtask', 'view', 'taskID=' . $testtask->id), $testtask->name, '_blank');?></strong>
-      <small class='text-success'> <?php echo $lang->testtask->doing;?> <?php echo html::icon($lang->icons['start']);?></small>
+      <small class='text-success'> <?php echo $lang->testtask->activate;?> <?php echo html::icon($lang->icons['start']);?></small>
     </div>
   </div>
 
diff --git a/module/testtask/view/blocked.html.php b/module/testtask/view/block.html.php
similarity index 96%
rename from module/testtask/view/blocked.html.php
rename to module/testtask/view/block.html.php
index 3aabb0eefb..923366c582 100644
--- a/module/testtask/view/blocked.html.php
+++ b/module/testtask/view/block.html.php
@@ -18,7 +18,7 @@
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['testtask']);?> <strong><?php echo $testtask->id;?></strong></span>
       <strong><?php echo html::a($this->createLink('testtask', 'view', 'taskID=' . $testtask->id), $testtask->name, '_blank');?></strong>
-      <small class='text-success'> <?php echo $lang->testtask->blocked;?> <?php echo html::icon($lang->icons['pause']);?></small>
+      <small class='text-success'> <?php echo $lang->testtask->block;?> <?php echo html::icon($lang->icons['pause']);?></small>
     </div>
   </div>
 
diff --git a/module/testtask/view/view.html.php b/module/testtask/view/view.html.php
index d22c17471a..6b625cbb18 100644
--- a/module/testtask/view/view.html.php
+++ b/module/testtask/view/view.html.php
@@ -31,7 +31,7 @@
         echo "<div class='btn-group'>";
         common::printIcon('testtask', 'start',    "taskID=$task->id", $task, 'button', '', '', 'iframe', true);
         common::printIcon('testtask', 'close',    "taskID=$task->id", $task, 'button', '', '', 'iframe', true);
-        common::printIcon('testtask', 'blocked',  "taskID=$task->id", $task, 'button', 'pause', '', 'iframe', true);
+        common::printIcon('testtask', 'block',    "taskID=$task->id", $task, 'button', 'pause', '', 'iframe', true);
         common::printIcon('testtask', 'activate', "taskID=$task->id", $task, 'button', 'magic', '', 'iframe', true);
         common::printIcon('testtask', 'cases',    "taskID=$task->id", $task, 'button', 'sitemap');
         common::printIcon('testtask', 'linkCase', "taskID=$task->id", $task, 'button', 'link');