diff --git a/config/config.php b/config/config.php
index f031d7d626..fafdd269b2 100644
--- a/config/config.php
+++ b/config/config.php
@@ -37,8 +37,8 @@ $config->sessionVar  = 'sid';             // requestType=GET: the session var na
 $config->views  = ',html,json,mhtml,'; 
 
 /* Set the wide window size. */
-$config->wideSize    = 1400;
-$config->formTimeout = 30000;
+$config->wideSize = 1400;
+$config->timeout  = 30000;
 
 /* Supported languages. */
 $config->langs['zh-cn'] = '简体';
diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php
index 3408cb5aa9..1ba8cedd1b 100644
--- a/module/admin/view/index.html.php
+++ b/module/admin/view/index.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php $showDemoUsers = isset($this->config->global->showDemoUsers) ? true : false; js::set('showDemoUsers', $showDemoUsers);?>
-<?php if(!$bind and $ignore and common::hasPriv('admin', 'register')):?>
+<?php if(!$bind and !$ignore and common::hasPriv('admin', 'register')):?>
 <div id="notice" class='alert alert-success'>
   <?php echo html::a(inlink('ignore'), '<i class="icon-remove"></i> ' . $lang->admin->notice->ignore, 'hiddenwin', 'class="close" data-dismiss="alert" style="font-size: 12px"');?>
   <div class="content"><i class='icon-info-sign'></i> <?php echo sprintf($lang->admin->notice->register, html::a(inlink('register'), $lang->admin->register->click, '', 'class="alert-link"'));?></div>
diff --git a/module/bug/model.php b/module/bug/model.php
index dba5241189..6cb1815049 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -132,12 +132,12 @@ class bugModel extends model
 
             if($latestBugs and in_array($bug->title, $latestBugs)) continue;
 
-           $this->dao->insert(TABLE_BUG)->data($bug)->autoCheck()->batchCheck($this->config->bug->create->requiredFields, 'notempty')->exec();
-           $bugID = $this->dao->lastInsertID();
-           $latestBugs[$bugID] = $bug->title;
+            $this->dao->insert(TABLE_BUG)->data($bug)->autoCheck()->batchCheck($this->config->bug->create->requiredFields, 'notempty')->exec();
+            $bugID = $this->dao->lastInsertID();
+            $latestBugs[$bugID] = $bug->title;
 
-           if(dao::isError()) die(js::error('bug#' . ($i+1) . dao::getError(true)));
-           $actions[$bugID] = $this->action->create('bug', $bugID, 'Opened');
+            if(dao::isError()) die(js::error('bug#' . ($i+1) . dao::getError(true)));
+            $actions[$bugID] = $this->action->create('bug', $bugID, 'Opened');
         }
         return $actions;
     }
@@ -792,7 +792,7 @@ class bugModel extends model
     {
         $title    = '';
         $bugSteps = '';
-        $steps    = $this->post->stepIDList;
+        $steps    = zget($_POST, 'stepIDList', array());
 
         $result = $this->dao->findById($resultID)->from(TABLE_TESTRESULT)->fetch();
         if($caseID > 0)
diff --git a/module/build/control.php b/module/build/control.php
index dadd3440bb..96552037f3 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()) die(js::error(dao::getError()));
             $this->loadModel('action')->create('build', $buildID, 'opened');
-            $actionID = $this->action->create('project', $projectID, 'createbuild', '', $buildID);
+            $this->action->create('project', $projectID, 'createbuild', '', $buildID);
             die(js::locate($this->createLink('project', 'build', "project=$projectID"), 'parent'));
         }
 
diff --git a/module/common/view/form.html.php b/module/common/view/form.html.php
index e0f00adf29..2b7431f757 100755
--- a/module/common/view/form.html.php
+++ b/module/common/view/form.html.php
@@ -1,5 +1,5 @@
 <?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
-<?php js::set('formTimeout', $this->config->formTimeout)?>
+<?php js::set('ajaxTimeout', $this->config->timeout)?>
 <?php
 js::import($jsRoot . 'jquery/form/min.js');
 js::import($jsRoot . 'jquery/form/zentao.js');
diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php
index 0c4fa4e47d..973a3e4f63 100644
--- a/module/testtask/view/cases.html.php
+++ b/module/testtask/view/cases.html.php
@@ -12,6 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/treeview.html.php';?>
+<?php include './caseheader.html.php';?>
 <?php js::set('confirmUnlink', $lang->testtask->confirmUnlinkCase)?>
 <script language="Javascript">
 var browseType = '<?php echo $browseType;?>';
diff --git a/module/tree/control.php b/module/tree/control.php
index f62f3b7771..6ce4341a1d 100644
--- a/module/tree/control.php
+++ b/module/tree/control.php
@@ -180,6 +180,21 @@ class tree extends control
         }
 
         $module = $this->tree->getById($moduleID);
+        if($module->owner == null and $module->root != 0 and $module->type != 'task')
+        {
+            $module->owner = $this->loadModel('product')->getById($module->root)->QD;
+        }
+
+        if($type == 'task')
+        {
+            $optionMenu = $this->tree->getTaskOptionMenu($module->root);
+            $this->view->optionMenu = $optionMenu;
+        }
+        else
+        {
+            $this->view->optionMenu = $this->tree->getOptionMenu($module->root, $module->type);
+        }
+
         $this->view->module = $module;
         $this->view->type   = $type;
         $this->view->users  = $this->loadModel('user')->getPairs('noclosed|nodeleted', $module->owner);
diff --git a/www/js/jquery/form/zentao.js b/www/js/jquery/form/zentao.js
index fb98e460c2..866a1a136a 100644
--- a/www/js/jquery/form/zentao.js
+++ b/www/js/jquery/form/zentao.js
@@ -6,7 +6,7 @@ $.extend(
         var options = 
         {
             target  : null,
-            timeout : formTimeout,
+            timeout : ajaxTimeout,
             dataType:'json',
 
             success:function(response)