From 55c45acae5edfafbc2e2414dbae982f7987cf1b3 Mon Sep 17 00:00:00 2001
From: jinianlan <jinianlan@qq.com>
Date: Wed, 24 Jul 2019 16:24:15 +0800
Subject: [PATCH 1/9] * fix Bug #2660

---
 module/testreport/lang/zh-cn.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/testreport/lang/zh-cn.php b/module/testreport/lang/zh-cn.php
index 165e8c41d9..2434557c78 100644
--- a/module/testreport/lang/zh-cn.php
+++ b/module/testreport/lang/zh-cn.php
@@ -47,7 +47,7 @@ $lang->testreport->legendComment     = '总结';
 $lang->testreport->legendMore        = '更多功能';
 
 $lang->testreport->bugSeverityGroups   = 'Bug严重级别分布';
-$lang->testreport->bugTypeGroups       = 'Bug类型别分布';
+$lang->testreport->bugTypeGroups       = 'Bug类型分布';
 $lang->testreport->bugStatusGroups     = 'Bug状态分布';
 $lang->testreport->bugOpenedByGroups   = 'Bug创建者分布';
 $lang->testreport->bugResolvedByGroups = 'Bug解决者分布';

From aecff9993270481cfd97d5d701452b51009d11c5 Mon Sep 17 00:00:00 2001
From: liugang <liugang@cnezsoft.com>
Date: Wed, 24 Jul 2019 17:49:40 +0800
Subject: [PATCH 2/9] * Fix bug of view a flow page by path_info.

---
 framework/router.class.php | 68 +++++++++++++++++++++++++++++++-------
 lib/pager/pager.class.php  | 54 ++++++++++++++++++++++++++++++
 2 files changed, 110 insertions(+), 12 deletions(-)

diff --git a/framework/router.class.php b/framework/router.class.php
index daf1c430b1..fd9aee2c1c 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -233,9 +233,7 @@ class router extends baseRouter
      */
     public function loadConfig($moduleName, $appName = '')
     {
-        $appName = '';
-
-        return parent::loadModuleConfig($moduleName, $appName);
+        return parent::loadModuleConfig($moduleName);
     }
 
     /**
@@ -278,16 +276,15 @@ class router extends baseRouter
             {
                 if($flow->buildin && $this->methodName == 'browselabel')
                 {
-                        $this->workflowModule = $this->moduleName;
-                        $this->workflowMethod = 'browse';
+                    $this->workflowModule = $this->moduleName;
+                    $this->workflowMethod = 'browse';
 
-                        $this->loadModuleConfig('workflowaction');
+                    $this->loadModuleConfig('workflowaction');
 
-                        $moduleName = 'flow';
-                        $methodName = 'browse';
+                    $moduleName = 'flow';
+                    $methodName = 'browse';
 
-                        $this->setModuleName($moduleName);
-                        $this->setMethodName($methodName);
+                    $this->setFlowURI($moduleName, $methodName);
                 }
                 else
                 {
@@ -302,8 +299,7 @@ class router extends baseRouter
                         $moduleName = 'flow';
                         $methodName = in_array($this->methodName, $this->config->workflowaction->default->actions) ? $this->methodName : 'operate';
 
-                        $this->setModuleName($moduleName);
-                        $this->setMethodName($methodName);
+                        $this->setFlowURI($moduleName, $methodName);
                     }
                 }
             }
@@ -313,6 +309,54 @@ class router extends baseRouter
         return parent::setControlFile($exitIfNone);
     }
 
+    /**
+     * Reset URI to flow's URI.
+     *
+     * @param  string $moduleName
+     * @param  string $methodName
+     * @access public
+     * @return void
+     */
+    public function setFlowURI($moduleName, $methodName)
+    {
+        $this->rawURI = $this->URI;
+        $this->setModuleName($moduleName);
+        $this->setMethodName($methodName);
+        if($this->config->requestType != 'GET')
+        {
+            $params = explode($this->config->requestFix, $this->URI);
+            /* Remove module and method. */
+            $params = array_slice($params, 2);
+            /* Prepend other params. */
+            array_unshift($params, $this->workflowModule);
+            array_unshift($params, $methodName);
+            array_unshift($params, $moduleName);
+
+            $this->URI = implode($this->config->requestFix, $params);
+        }
+        else
+        {
+            $params = parse_url($this->URI);
+            /* Extract $path and $query from $params. */
+            extract($params); 
+            parse_str($query, $params);
+            /* Remove module and method. */
+            unset($params[$this->config->moduleVar]);
+            unset($params[$this->config->methodVar]);
+
+            $params = array_reverse($params);
+
+            /* Prepend other params. */
+            $params['module']                 = $this->workflowModule;
+            $params[$this->config->methodVar] = $methodName;
+            $params[$this->config->moduleVar] = $moduleName;
+
+            $params = array_reverse($params);
+
+            $this->URI = $path . '?' . http_build_query($params);
+        }
+    }
+
     /**
      * PATH_INFO方式解析，获取$URI和$viewType。
      * Parse PATH_INFO, get the $URI and $viewType.
diff --git a/lib/pager/pager.class.php b/lib/pager/pager.class.php
index 4a2d462b18..09493b48a6 100644
--- a/lib/pager/pager.class.php
+++ b/lib/pager/pager.class.php
@@ -20,6 +20,60 @@ helper::import(dirname(dirname(__FILE__)) . '/base/pager/pager.class.php');
  */
 class pager extends basePager
 {
+    /**
+     * 设置模块名。
+     * Set the $moduleName property.
+     * 
+     * @access public
+     * @return void
+     */
+    public function setModuleName()
+    {
+        if(isset($this->app->workflowModule))
+        {
+            $this->moduleName = $this->app->workflowModule;
+        }
+        else
+        {
+            $this->moduleName = $this->app->getModuleName();
+        }
+    }
+
+    /**
+     * 设置方法名。
+     * Set the $methodName property.
+     * 
+     * @access public
+     * @return void
+     */
+    public function setMethodName()
+    {
+        if(isset($this->app->workflowMethod))
+        {
+            $this->methodName = $this->app->workflowMethod;
+        }
+        else
+        {
+            $this->methodName = $this->app->getMethodName();
+        }
+    }
+
+    /**
+     * 从请求网址中获取记录总数、每页记录数、页码。
+     * Get recTotal, recPerpage, pageID from the request params, and add them to params.
+     * 
+     * @access public
+     * @return void
+     */
+    public function setParams()
+    {
+        parent::setParams();
+        if(isset($this->app->workflowModule) && isset($this->app->workflowMethod))
+        {
+            unset($this->params['module']);
+        }
+    }
+
     /**
      * Show pager.
      * 

From 3d626b7026e946576f1b6e356ea4daa0c47a4840 Mon Sep 17 00:00:00 2001
From: chenfei <chenfei@cnezsoft.com>
Date: Wed, 24 Jul 2019 18:06:29 +0800
Subject: [PATCH 3/9]  * Fix bug of view a flow page by path_info.

---
 framework/router.class.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/framework/router.class.php b/framework/router.class.php
index fd9aee2c1c..652ef70725 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -319,15 +319,17 @@ class router extends baseRouter
      */
     public function setFlowURI($moduleName, $methodName)
     {
-        $this->rawURI = $this->URI;
         $this->setModuleName($moduleName);
         $this->setMethodName($methodName);
         if($this->config->requestType != 'GET')
         {
             $params = explode($this->config->requestFix, $this->URI);
+
             /* Remove module and method. */
             $params = array_slice($params, 2);
+
             /* Prepend other params. */
+            if($methodName == 'operate') array_unshift($params, $this->workflowMethod);
             array_unshift($params, $this->workflowModule);
             array_unshift($params, $methodName);
             array_unshift($params, $moduleName);
@@ -404,7 +406,7 @@ class router extends baseRouter
             $passedParams = array_reverse($passedParams);
             if(!in_array($this->workflowMethod, $this->config->workflowaction->default->actions))
             {
-                $passedParams['method'] = $this->workflowMethod;
+                $passedParams['action'] = $this->workflowMethod;
             }
             $passedParams['module'] = $this->workflowModule;
 

From 821095baf76b3598d25a57692e6ec36fd456a85e Mon Sep 17 00:00:00 2001
From: chenfei <chenfei@cnezsoft.com>
Date: Wed, 24 Jul 2019 18:26:00 +0800
Subject: [PATCH 4/9]  * Adjust execute hook for workflow.

---
 module/bug/control.php         | 2 ++
 module/build/control.php       | 2 ++
 module/product/control.php     | 2 ++
 module/productplan/control.php | 2 ++
 module/project/control.php     | 2 ++
 module/release/control.php     | 2 ++
 module/story/control.php       | 2 ++
 module/task/control.php        | 2 ++
 module/testcase/control.php    | 2 ++
 module/testsuite/control.php   | 2 ++
 module/testtask/control.php    | 2 ++
 11 files changed, 22 insertions(+)

diff --git a/module/bug/control.php b/module/bug/control.php
index 2de97222e0..d60fa5224c 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -554,6 +554,8 @@ class bug extends control
         $productName = $this->products[$productID];
         $branches    = $this->session->currentProductType == 'normal' ? array() : $this->loadModel('branch')->getPairs($bug->product);
 
+        $this->executeHooks($this->methodName, $bugID);
+
         /* Header and positon. */
         $this->view->title      = "BUG #$bug->id $bug->title - " . $this->products[$productID];
         $this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $productName);
diff --git a/module/build/control.php b/module/build/control.php
index b5fe5d652a..8923f49641 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -230,6 +230,8 @@ class build extends control
             $this->view->type          = $type;
         }
 
+        $this->executeHooks($this->methodName, $buildID);
+
         /* Assign. */
         $this->view->users         = $this->loadModel('user')->getPairs('noletter');
         $this->view->build         = $build;
diff --git a/module/product/control.php b/module/product/control.php
index 0c6321c3a8..b8116a78c7 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -394,6 +394,8 @@ class product extends control
         $this->app->loadClass('pager', $static = true);
         $pager = new pager(0, 30, 1);
 
+        $this->executeHooks($this->methodName, $productID);
+
         $this->view->title      = $product->name . $this->lang->colon . $this->lang->product->view;
         $this->view->position[] = html::a($this->createLink($this->moduleName, 'browse'), $product->name);
         $this->view->position[] = $this->lang->product->view;
diff --git a/module/productplan/control.php b/module/productplan/control.php
index 59f3f2670f..2a36115f83 100644
--- a/module/productplan/control.php
+++ b/module/productplan/control.php
@@ -276,6 +276,8 @@ class productplan extends control
             $orderBy = str_replace('id', 'order', $orderBy);
         }
 
+        $this->executeHooks($this->methodName, $planID);
+
         if($plan->parent > 0)     $this->view->parentPlan    = $this->productplan->getById($plan->parent);
         if($plan->parent == '-1') $this->view->childrenPlans = $this->productplan->getChildren($plan->id);
 
diff --git a/module/project/control.php b/module/project/control.php
index ec341409ac..ed746fbd22 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1441,6 +1441,8 @@ class project extends control
         $this->app->loadClass('pager', $static = true);
         $pager = new pager(0, 30, 1);
 
+        $this->executeHooks($this->methodName, $projectID);
+
         $this->view->title      = $this->lang->project->view;
         $this->view->position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name);
         $this->view->position[] = $this->view->title;
diff --git a/module/release/control.php b/module/release/control.php
index 534073a4fc..a86f511978 100644
--- a/module/release/control.php
+++ b/module/release/control.php
@@ -162,6 +162,8 @@ class release extends control
         $this->commonAction($release->product);
         $product = $this->product->getById($release->product);
 
+        $this->executeHooks($this->methodName, $releaseID);
+
         $this->view->title         = "RELEASE #$release->id $release->name/" . $product->name;
         $this->view->position[]    = $this->lang->release->view;
         $this->view->release       = $release;
diff --git a/module/story/control.php b/module/story/control.php
index 9c6e72bf22..3fe0950dca 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -705,6 +705,8 @@ class story extends control
             if($project->status == 'done') $from = '';
         }
 
+        $this->executeHooks($this->methodName, $storyID);
+
         $title      = "STORY #$story->id $story->title - $product->name";
         $position[] = html::a($this->createLink('product', 'browse', "product=$product->id&branch=$story->branch"), $product->name);
         $position[] = $this->lang->story->common;
diff --git a/module/task/control.php b/module/task/control.php
index cdda54f92a..7164bd34ae 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -606,6 +606,8 @@ class task extends control
         $project = $this->project->getById($task->project);
         $this->project->setMenu($this->project->getPairs(), $project->id);
 
+        $this->executeHooks($this->methodName, $taskID);
+
         $title      = "TASK#$task->id $task->name / $project->name";
         $position[] = html::a($this->createLink('project', 'browse', "projectID=$task->project"), $project->name);
         $position[] = $this->lang->task->common;
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 2e9ba9e197..5558cd5689 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -516,6 +516,8 @@ class testcase extends control
             ->fetch('count');
         $case->caseFails = $caseFails;
 
+        $this->executeHooks($this->methodName, $caseID);
+
         $this->view->position[] = $this->lang->testcase->common;
         $this->view->position[] = $this->lang->testcase->view;
 
diff --git a/module/testsuite/control.php b/module/testsuite/control.php
index 11f1887fa6..4b25be9332 100644
--- a/module/testsuite/control.php
+++ b/module/testsuite/control.php
@@ -142,6 +142,8 @@ class testsuite extends control
         $this->app->loadClass('pager', $static = true);
         $pager = pager::init($recTotal, $recPerPage, $pageID);
 
+        $this->executeHooks($this->methodName, $suiteID);
+
         $this->view->title      = "SUITE #$suite->id $suite->name/" . $this->products[$productID];
         $this->view->position[] = html::a($this->createLink('testsuite', 'browse', "productID=$productID"), $this->products[$productID]);
         $this->view->position[] = $this->lang->testsuite->common;
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 524615aadc..85dd912a2e 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -216,6 +216,8 @@ class testtask extends control
 
         $this->testtask->setMenu($this->products, $productID, $task->branch, $taskID);
 
+        $this->executeHooks($this->methodName, $taskID);
+
         $this->view->title      = "TASK #$task->id $task->name/" . $this->products[$productID];
         $this->view->position[] = html::a($this->createLink('testtask', 'browse', "productID=$productID"), $this->products[$productID]);
         $this->view->position[] = $this->lang->testtask->common;

From b6b9901b82bddf229cc6994e3c6674790d216261 Mon Sep 17 00:00:00 2001
From: jinianlan <jinianlan@qq.com>
Date: Wed, 24 Jul 2019 20:04:35 +0800
Subject: [PATCH 5/9] * fix Bug #2653

---
 module/bug/view/browse.html.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 2200451782..c742e1d877 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -241,18 +241,18 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
               <?php
               $class = "class='disabled'";
               $actionLink = $this->createLink('bug', 'batchConfirm');
-              $misc = common::hasPriv('bug', 'batchConfirm') ? "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"" : $class;
+              $misc = (common::hasPriv('bug', 'batchConfirm') && common::hasPriv('bug','confirmBug')) ? "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"" : "";
               if($misc) echo "<li>" . html::a('javascript:;', $lang->bug->confirmBug, '', $misc) . "</li>";
 
               $actionLink = $this->createLink('bug', 'batchClose');
-              $misc = common::hasPriv('bug', 'batchClose') ? "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"" : $class;
+              $misc = (common::hasPriv('bug', 'batchClose') && common::hasPriv('bug','close')) ? "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"" : "";
               if($misc) echo "<li>" . html::a('javascript:;', $lang->bug->close, '', $misc) . "</li>";
 
               $actionLink = $this->createLink('bug', 'batchActivate', "productID=$productID&branch=$branch");
-              $misc = common::hasPriv('bug', 'batchActivate') ? "onclick=\"setFormAction('$actionLink')\"" : $class;
+              $misc = (common::hasPriv('bug', 'batchActivate') && common::hasPriv('bug','activate')) ? "onclick=\"setFormAction('$actionLink')\"" : "";
               if($misc) echo "<li>" . html::a('javascript:;', $lang->bug->activate, '', $misc) . "</li>";
 
-              $misc = common::hasPriv('bug', 'batchResolve') ? "id='resolveItem'" : '';
+              $misc = (common::hasPriv('bug', 'batchResolve') && common::hasPriv('bug','resolve')) ? "id='resolveItem'" : '';
               if($misc)
               {
                   echo "<li class='dropdown-submenu'>" . html::a('javascript:;', $lang->bug->resolve,  '', $misc);

From 621f338faa8ec51d5ca643a4a5e8cd0bf47a3701 Mon Sep 17 00:00:00 2001
From: liugang <liugang@cnezsoft.com>
Date: Thu, 25 Jul 2019 13:02:18 +0800
Subject: [PATCH 6/9] * Optimize the function executeHooks.

---
 framework/control.class.php    | 15 ++++-----------
 module/bug/control.php         | 18 +++++++++---------
 module/build/control.php       |  8 ++++----
 module/product/control.php     | 10 +++++-----
 module/productplan/control.php |  8 ++++----
 module/project/control.php     | 18 +++++++++---------
 module/release/control.php     |  8 ++++----
 module/story/control.php       | 18 +++++++++---------
 module/task/control.php        | 28 ++++++++++++++--------------
 module/testcase/control.php    | 10 +++++-----
 module/testsuite/control.php   |  8 ++++----
 module/testtask/control.php    | 16 ++++++++--------
 12 files changed, 79 insertions(+), 86 deletions(-)

diff --git a/framework/control.class.php b/framework/control.class.php
index 844158bf95..9b942bbcb5 100644
--- a/framework/control.class.php
+++ b/framework/control.class.php
@@ -198,24 +198,17 @@ class control extends baseControl
     /**
      * Execute hooks of a method.
      *
-     * @param  string $methodName
      * @param  int    $objectID
      * @access public
      * @return void
      */
-    public function executeHooks($methodName, $objectID)
+    public function executeHooks($objectID)
     {
         if(!isset($this->config->bizVersion)) return false;
 
-        $flowFile   = $this->app->getModuleRoot() . 'workflow/model.php';
-        $actionFile = $this->app->getModuleRoot() . 'workflowaction/model.php';
-        $hookFile   = $this->app->getModuleRoot() . 'workflowhook/model.php';
-        if(is_file($flowFile) && is_file($actionFile) && is_file($hookFile))
-        {
-            $flow   = $this->loadModel('workflow')->getByModule($this->moduleName);
-            $action = $this->loadModel('workflowaction')->getByModuleAndAction($this->moduleName, $this->methodName);
-            if($flow && $action) $this->loadModel('workflowhook')->execute($flow, $action, $objectID);
-        }
+        $flow   = $this->loadModel('workflow')->getByModule($this->moduleName);
+        $action = $this->loadModel('workflowaction')->getByModuleAndAction($this->moduleName, $this->methodName);
+        if($flow && $action) $this->loadModel('workflowhook')->execute($flow, $action, $objectID);
     }
 
     /**
diff --git a/module/bug/control.php b/module/bug/control.php
index d60fa5224c..62f3204dbe 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -295,7 +295,7 @@ class bug extends control
                 $this->action->create('todo', $output['todoID'], 'finished', '', "BUG:$bugID");
             }
 
-            $this->executeHooks($this->methodName, $bugID);
+            $this->executeHooks($bugID);
 
             if(defined('RUN_MODE') && RUN_MODE == 'api') $this->send(array('status' => 'success', 'data' => $bugID));
 
@@ -554,7 +554,7 @@ class bug extends control
         $productName = $this->products[$productID];
         $branches    = $this->session->currentProductType == 'normal' ? array() : $this->loadModel('branch')->getPairs($bug->product);
 
-        $this->executeHooks($this->methodName, $bugID);
+        $this->executeHooks($bugID);
 
         /* Header and positon. */
         $this->view->title      = "BUG #$bug->id $bug->title - " . $this->products[$productID];
@@ -617,7 +617,7 @@ class bug extends control
             if(defined('RUN_MODE') && RUN_MODE == 'api') $this->send(array('status' => 'success', 'data' => $bugID));
             $bug = $this->bug->getById($bugID);
 
-            $this->executeHooks($this->methodName, $bugID);
+            $this->executeHooks($bugID);
 
             if($bug->toTask != 0)
             {
@@ -834,7 +834,7 @@ class bug extends control
             $actionID = $this->action->create('bug', $bugID, 'Assigned', $this->post->comment, $this->post->assignedTo);
             $this->action->logHistory($actionID, $changes);
 
-            $this->executeHooks($this->methodName, $bugID);
+            $this->executeHooks($bugID);
 
             if(isonlybody()) die(js::closeModal('parent.parent'));
             die(js::locate($this->createLink('bug', 'view', "bugID=$bugID"), 'parent'));
@@ -949,7 +949,7 @@ class bug extends control
             $actionID = $this->action->create('bug', $bugID, 'bugConfirmed', $this->post->comment);
             $this->action->logHistory($actionID, $changes);
 
-            $this->executeHooks($this->methodName, $bugID);
+            $this->executeHooks($bugID);
 
             if(isonlybody()) die(js::closeModal('parent.parent'));
             die(js::locate($this->createLink('bug', 'view', "bugID=$bugID"), 'parent'));
@@ -1007,7 +1007,7 @@ class bug extends control
 
             $bug = $this->bug->getById($bugID);
 
-            $this->executeHooks($this->methodName, $bugID);
+            $this->executeHooks($bugID);
 
             if($bug->toTask != 0)
             {
@@ -1099,7 +1099,7 @@ class bug extends control
             $actionID = $this->action->create('bug', $bugID, 'Activated', $this->post->comment);
             $this->action->logHistory($actionID, $changes);
 
-            $this->executeHooks($this->methodName, $bugID);
+            $this->executeHooks($bugID);
 
             if(isonlybody()) die(js::closeModal('parent.parent'));
             die(js::locate($this->createLink('bug', 'view', "bugID=$bugID"), 'parent'));
@@ -1138,7 +1138,7 @@ class bug extends control
             $actionID = $this->action->create('bug', $bugID, 'Closed', $this->post->comment);
             $this->action->logHistory($actionID, $changes);
 
-            $this->executeHooks($this->methodName, $bugID);
+            $this->executeHooks($bugID);
 
             if(isonlybody()) die(js::closeModal('parent.parent'));
             if(defined('RUN_MODE') && RUN_MODE == 'api')
@@ -1306,7 +1306,7 @@ class bug extends control
             $this->bug->delete(TABLE_BUG, $bugID);
             if($bug->toTask != 0) echo js::alert($this->lang->bug->remindTask . $bug->toTask);
 
-            $this->executeHooks($this->methodName, $bugID);
+            $this->executeHooks($bugID);
 
             die(js::locate($this->session->bugList, 'parent'));
         }
diff --git a/module/build/control.php b/module/build/control.php
index 8923f49641..6ccf578f75 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -26,7 +26,7 @@ class build extends control
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
             $this->loadModel('action')->create('build', $buildID, 'opened');
 
-            $this->executeHooks($this->methodName, $buildID);
+            $this->executeHooks($buildID);
 
             if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.loadProjectBuilds($projectID)"));//Code for task #5126.
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('build', 'view', "buildID=$buildID")));
@@ -108,7 +108,7 @@ class build extends control
                 if(!empty($changes)) $this->action->logHistory($actionID, $changes);
             }
 
-            $this->executeHooks($this->methodName, $buildID);
+            $this->executeHooks($buildID);
 
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('view', "buildID=$buildID")));
         }
@@ -230,7 +230,7 @@ class build extends control
             $this->view->type          = $type;
         }
 
-        $this->executeHooks($this->methodName, $buildID);
+        $this->executeHooks($buildID);
 
         /* Assign. */
         $this->view->users         = $this->loadModel('user')->getPairs('noletter');
@@ -263,7 +263,7 @@ class build extends control
             $build = $this->build->getById($buildID);
             $this->build->delete(TABLE_BUILD, $buildID);
 
-            $this->executeHooks($this->methodName, $buildID);
+            $this->executeHooks($buildID);
 
             /* if ajax request, send result. */
             if($this->server->ajax)
diff --git a/module/product/control.php b/module/product/control.php
index b8116a78c7..09a734b5b9 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -210,7 +210,7 @@ class product extends control
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
             $this->loadModel('action')->create('product', $productID, 'opened');
 
-            $this->executeHooks($this->methodName, $productID);
+            $this->executeHooks($productID);
 
             $locate = $this->createLink($this->moduleName, 'browse', "productID=$productID");
             if(isset($this->config->global->flow) and $this->config->global->flow == 'onlyTest') $locate = $this->createLink($this->moduleName, 'build', "productID=$productID");
@@ -260,7 +260,7 @@ class product extends control
                 $this->action->logHistory($actionID, $changes);
             }
 
-            $this->executeHooks($this->methodName, $productID);
+            $this->executeHooks($productID);
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('view', "product=$productID")));
         }
 
@@ -360,7 +360,7 @@ class product extends control
                 $this->action->logHistory($actionID, $changes);
             }
 
-            $this->executeHooks($this->methodName, $productID);
+            $this->executeHooks($productID);
 
             die(js::reload('parent.parent'));
         }
@@ -394,7 +394,7 @@ class product extends control
         $this->app->loadClass('pager', $static = true);
         $pager = new pager(0, 30, 1);
 
-        $this->executeHooks($this->methodName, $productID);
+        $this->executeHooks($productID);
 
         $this->view->title      = $product->name . $this->lang->colon . $this->lang->product->view;
         $this->view->position[] = html::a($this->createLink($this->moduleName, 'browse'), $product->name);
@@ -430,7 +430,7 @@ class product extends control
             $this->product->delete(TABLE_PRODUCT, $productID);
             $this->dao->update(TABLE_DOCLIB)->set('deleted')->eq(1)->where('product')->eq($productID)->exec();
             $this->session->set('product', '');     // 清除session。
-            $this->executeHooks($this->methodName, $productID);
+            $this->executeHooks($productID);
             die(js::locate($this->createLink('product', 'browse'), 'parent'));
         }
     }
diff --git a/module/productplan/control.php b/module/productplan/control.php
index 2a36115f83..c3facf8ff2 100644
--- a/module/productplan/control.php
+++ b/module/productplan/control.php
@@ -50,7 +50,7 @@ class productplan extends control
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
             $this->loadModel('action')->create('productplan', $planID, 'opened');
 
-            $this->executeHooks($this->methodName, $planID);
+            $this->executeHooks($planID);
 
             if(isonlybody()) die(js::closeModal('parent.parent', '', "function(){parent.parent.$('a.refresh').click()}"));
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('productplan', 'browse', "productID=$product&branch=$branch")));
@@ -99,7 +99,7 @@ class productplan extends control
                 $actionID = $this->loadModel('action')->create('productplan', $planID, 'edited');
                 $this->action->logHistory($actionID, $changes);
             }
-            $this->executeHooks($this->methodName, $planID);
+            $this->executeHooks($planID);
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('view', "planID=$planID")));
         }
 
@@ -166,7 +166,7 @@ class productplan extends control
             $plan = $this->productplan->getById($planID);
             $this->productplan->delete(TABLE_PRODUCTPLAN, $planID);
 
-            $this->executeHooks($this->methodName, $planID);
+            $this->executeHooks($planID);
 
             /* if ajax request, send result. */
             if($this->server->ajax)
@@ -276,7 +276,7 @@ class productplan extends control
             $orderBy = str_replace('id', 'order', $orderBy);
         }
 
-        $this->executeHooks($this->methodName, $planID);
+        $this->executeHooks($planID);
 
         if($plan->parent > 0)     $this->view->parentPlan    = $this->productplan->getById($plan->parent);
         if($plan->parent == '-1') $this->view->childrenPlans = $this->productplan->getChildren($plan->id);
diff --git a/module/project/control.php b/module/project/control.php
index ed746fbd22..4c4ba81e6e 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1055,7 +1055,7 @@ class project extends control
 
             $this->loadModel('action')->create('project', $projectID, 'opened', '', join(',', $_POST['products']));
 
-            $this->executeHooks($this->methodName, $projectID);
+            $this->executeHooks($projectID);
 
             $planID = reset($_POST['plans']);
             if(!empty($planID))
@@ -1124,7 +1124,7 @@ class project extends control
                 $actionID = $this->loadModel('action')->create('project', $projectID, 'edited');
                 $this->action->logHistory($actionID, $changes);
             }
-            $this->executeHooks($this->methodName, $projectID);
+            $this->executeHooks($projectID);
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('view', "projectID=$projectID")));
         }
 
@@ -1252,7 +1252,7 @@ class project extends control
                 $actionID = $this->action->create('project', $projectID, 'Started', $this->post->comment);
                 $this->action->logHistory($actionID, $changes);
             }
-            $this->executeHooks($this->methodName, $projectID);
+            $this->executeHooks($projectID);
             die(js::reload('parent.parent'));
         }
 
@@ -1287,7 +1287,7 @@ class project extends control
                 $actionID = $this->action->create('project', $projectID, 'Delayed', $this->post->comment);
                 $this->action->logHistory($actionID, $changes);
             }
-            $this->executeHooks($this->methodName, $projectID);
+            $this->executeHooks($projectID);
             die(js::reload('parent.parent'));
         }
 
@@ -1322,7 +1322,7 @@ class project extends control
                 $actionID = $this->action->create('project', $projectID, 'Suspended', $this->post->comment);
                 $this->action->logHistory($actionID, $changes);
             }
-            $this->executeHooks($this->methodName, $projectID);
+            $this->executeHooks($projectID);
             die(js::reload('parent.parent'));
         }
 
@@ -1357,7 +1357,7 @@ class project extends control
                 $actionID = $this->action->create('project', $projectID, 'Activated', $this->post->comment);
                 $this->action->logHistory($actionID, $changes);
             }
-            $this->executeHooks($this->methodName, $projectID);
+            $this->executeHooks($projectID);
             die(js::reload('parent.parent'));
         }
 
@@ -1399,7 +1399,7 @@ class project extends control
                 $actionID = $this->action->create('project', $projectID, 'Closed', $this->post->comment);
                 $this->action->logHistory($actionID, $changes);
             }
-            $this->executeHooks($this->methodName, $projectID);
+            $this->executeHooks($projectID);
             die(js::reload('parent.parent'));
         }
 
@@ -1441,7 +1441,7 @@ class project extends control
         $this->app->loadClass('pager', $static = true);
         $pager = new pager(0, 30, 1);
 
-        $this->executeHooks($this->methodName, $projectID);
+        $this->executeHooks($projectID);
 
         $this->view->title      = $this->lang->project->view;
         $this->view->position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name);
@@ -1710,7 +1710,7 @@ class project extends control
             $this->project->delete(TABLE_PROJECT, $projectID);
             $this->dao->update(TABLE_DOCLIB)->set('deleted')->eq(1)->where('project')->eq($projectID)->exec();
             $this->session->set('project', '');
-            $this->executeHooks($this->methodName, $projectID);
+            $this->executeHooks($projectID);
             die(js::locate(inlink('index'), 'parent'));
         }
     }
diff --git a/module/release/control.php b/module/release/control.php
index a86f511978..9fe14f25c9 100644
--- a/module/release/control.php
+++ b/module/release/control.php
@@ -63,7 +63,7 @@ class release extends control
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
             $this->loadModel('action')->create('release', $releaseID, 'opened');
 
-            $this->executeHooks($this->methodName, $releaseID);
+            $this->executeHooks($releaseID);
 
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('view', "releaseID=$releaseID")));
         }
@@ -103,7 +103,7 @@ class release extends control
                 $actionID = $this->loadModel('action')->create('release', $releaseID, 'Edited', $fileAction);
                 if(!empty($changes)) $this->action->logHistory($actionID, $changes);
             }
-            $this->executeHooks($this->methodName, $releaseID);
+            $this->executeHooks($releaseID);
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('view', "releaseID=$releaseID")));
         }
         $this->loadModel('story');
@@ -162,7 +162,7 @@ class release extends control
         $this->commonAction($release->product);
         $product = $this->product->getById($release->product);
 
-        $this->executeHooks($this->methodName, $releaseID);
+        $this->executeHooks($releaseID);
 
         $this->view->title         = "RELEASE #$release->id $release->name/" . $product->name;
         $this->view->position[]    = $this->lang->release->view;
@@ -202,7 +202,7 @@ class release extends control
             $build   = $this->dao->select('*')->from(TABLE_BUILD)->where('id')->eq((int)$release->build)->fetch();
             if(empty($build->project)) $this->loadModel('build')->delete(TABLE_BUILD, $build->id);
 
-            $this->executeHooks($this->methodName, $releaseID);
+            $this->executeHooks($releaseID);
 
             /* if ajax request, send result. */
             if($this->server->ajax)
diff --git a/module/story/control.php b/module/story/control.php
index 3fe0950dca..778d5ecc85 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -113,7 +113,7 @@ class story extends control
                 $this->action->create('todo', $todoID, 'finished', '', "STORY:$storyID");
             }
 
-            $this->executeHooks($this->methodName, $storyID);
+            $this->executeHooks($storyID);
 
             if($this->post->newStory)
             {
@@ -436,7 +436,7 @@ class story extends control
                 $this->action->logHistory($actionID, $changes);
             }
 
-            $this->executeHooks($this->methodName, $storyID);
+            $this->executeHooks($storyID);
 
             if(defined('RUN_MODE') && RUN_MODE == 'api')
             {
@@ -622,7 +622,7 @@ class story extends control
                 $this->action->logHistory($actionID, $changes);
             }
 
-            $this->executeHooks($this->methodName, $storyID);
+            $this->executeHooks($storyID);
 
             die(js::locate($this->createLink('story', 'view', "storyID=$storyID"), 'parent'));
         }
@@ -657,7 +657,7 @@ class story extends control
             if(dao::isError()) die(js::error(dao::getError()));
             $actionID = $this->action->create('story', $storyID, 'Activated', $this->post->comment);
 
-            $this->executeHooks($this->methodName, $storyID);
+            $this->executeHooks($storyID);
 
             if(isonlybody()) die(js::closeModal('parent.parent', 'this'));
             die(js::locate($this->createLink('story', 'view', "storyID=$storyID"), 'parent'));
@@ -705,7 +705,7 @@ class story extends control
             if($project->status == 'done') $from = '';
         }
 
-        $this->executeHooks($this->methodName, $storyID);
+        $this->executeHooks($storyID);
 
         $title      = "STORY #$story->id $story->title - $product->name";
         $position[] = html::a($this->createLink('product', 'browse', "product=$product->id&branch=$story->branch"), $product->name);
@@ -752,7 +752,7 @@ class story extends control
         {
             $this->story->delete(TABLE_STORY, $storyID);
 
-            $this->executeHooks($this->methodName, $storyID);
+            $this->executeHooks($storyID);
 
             die(js::locate($this->session->storyList, 'parent'));
         }
@@ -778,7 +778,7 @@ class story extends control
                 $this->action->create('story', $storyID, 'Closed', '', ucfirst($this->post->closedReason));
             }
 
-            $this->executeHooks($this->methodName, $storyID);
+            $this->executeHooks($storyID);
 
             die(js::locate(inlink('view', "storyID=$storyID"), 'parent'));
         }
@@ -849,7 +849,7 @@ class story extends control
             $actionID = $this->action->create('story', $storyID, 'Closed', $this->post->comment, ucfirst($this->post->closedReason) . ($this->post->duplicateStory ? ':' . (int)$this->post->duplicateStory : ''));
             $this->action->logHistory($actionID, $changes);
 
-            $this->executeHooks($this->methodName, $storyID);
+            $this->executeHooks($storyID);
 
             if(isonlybody()) die(js::closeModal('parent.parent', 'this'));
             if(defined('RUN_MODE') && RUN_MODE == 'api')
@@ -1078,7 +1078,7 @@ class story extends control
                 $this->action->logHistory($actionID, $changes);
             }
 
-            $this->executeHooks($this->methodName, $storyID);
+            $this->executeHooks($storyID);
 
             if(isonlybody()) die(js::closeModal('parent.parent', 'this'));
             die(js::locate($this->createLink('story', 'view', "storyID=$storyID"), 'parent'));
diff --git a/module/task/control.php b/module/task/control.php
index 7164bd34ae..6ef67fee10 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -127,7 +127,7 @@ class task extends control
             /* If link from no head then reload*/
             if(isonlybody())
             {
-                $this->executeHooks($this->methodName, $taskID);
+                $this->executeHooks($taskID);
                 $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
             }
 
@@ -137,7 +137,7 @@ class task extends control
                 $this->action->create('todo', $todoID, 'finished', '', "TASK:$taskID");
             }
 
-            $this->executeHooks($this->methodName, $taskID);
+            $this->executeHooks($taskID);
 
             /* Locate the browser. */
             if($this->app->getViewType() == 'xhtml')
@@ -321,7 +321,7 @@ class task extends control
                 if(!empty($changes)) $this->action->logHistory($actionID, $changes);
             }
 
-            $this->executeHooks($this->methodName, $taskID);
+            $this->executeHooks($taskID);
 
             if($task->fromBug != 0)
             {
@@ -485,7 +485,7 @@ class task extends control
             $actionID = $this->action->create('task', $taskID, 'Assigned', $this->post->comment, $this->post->assignedTo);
             $this->action->logHistory($actionID, $changes);
 
-            $this->executeHooks($this->methodName, $taskID);
+            $this->executeHooks($taskID);
 
             if(isonlybody()) die(js::closeModal('parent.parent', 'this'));
             die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
@@ -606,7 +606,7 @@ class task extends control
         $project = $this->project->getById($task->project);
         $this->project->setMenu($this->project->getPairs(), $project->id);
 
-        $this->executeHooks($this->methodName, $taskID);
+        $this->executeHooks($taskID);
 
         $title      = "TASK#$task->id $task->name / $project->name";
         $position[] = html::a($this->createLink('project', 'browse', "projectID=$task->project"), $project->name);
@@ -638,7 +638,7 @@ class task extends control
         $this->dao->update(TABLE_TASK)->set('storyVersion')->eq($task->latestStoryVersion)->where('id')->eq($taskID)->exec();
         $this->loadModel('action')->create('task', $taskID, 'confirmed', '', $task->latestStoryVersion);
 
-        $this->executeHooks($this->methodName, $taskID);
+        $this->executeHooks($taskID);
 
         die(js::reload('parent'));
     }
@@ -670,7 +670,7 @@ class task extends control
             /* Remind whether to update status of the bug, if task which from that bug has been finished. */
             $task = $this->task->getById($taskID);
 
-            $this->executeHooks($this->methodName, $taskID);
+            $this->executeHooks($taskID);
 
             if($changes and $this->task->needUpdateBugStatus($task))
             {
@@ -822,7 +822,7 @@ class task extends control
                 $this->action->logHistory($actionID, $changes);
             }
 
-            $this->executeHooks($this->methodName, $taskID);
+            $this->executeHooks($taskID);
 
             if($this->task->needUpdateBugStatus($task))
             {
@@ -901,7 +901,7 @@ class task extends control
                 $this->action->logHistory($actionID, $changes);
             }
 
-            $this->executeHooks($this->methodName, $taskID);
+            $this->executeHooks($taskID);
 
             if(isonlybody()) die(js::closeModal('parent.parent', 'this'));
             die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
@@ -938,7 +938,7 @@ class task extends control
                 $this->action->logHistory($actionID, $changes);
             }
 
-            $this->executeHooks($this->methodName, $taskID);
+            $this->executeHooks($taskID);
 
             if(isonlybody()) die(js::closeModal('parent.parent', 'this'));
             die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
@@ -973,7 +973,7 @@ class task extends control
                 $this->action->logHistory($actionID, $changes);
             }
 
-            $this->executeHooks($this->methodName, $taskID);
+            $this->executeHooks($taskID);
 
             if(isonlybody()) die(js::closeModal('parent.parent', 'this'));
             if(defined('RUN_MODE') && RUN_MODE == 'api')
@@ -1098,7 +1098,7 @@ class task extends control
                 $this->action->logHistory($actionID, $changes);
             }
 
-            $this->executeHooks($this->methodName, $taskID);
+            $this->executeHooks($taskID);
 
             if(isonlybody()) die(js::closeModal('parent.parent', 'this'));
             die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
@@ -1134,7 +1134,7 @@ class task extends control
                 $this->action->logHistory($actionID, $changes);
             }
 
-            $this->executeHooks($this->methodName, $taskID);
+            $this->executeHooks($taskID);
 
             if(isonlybody()) die(js::closeModal('parent.parent', 'this'));
             die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
@@ -1178,7 +1178,7 @@ class task extends control
                 }
             }
 
-            $this->executeHooks($this->methodName, $taskID);
+            $this->executeHooks($taskID);
 
             die(js::locate($this->session->taskList, 'parent'));
         }
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 5558cd5689..455d232f12 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -238,7 +238,7 @@ class testcase extends control
             $this->loadModel('action');
             $this->action->create('case', $caseID, 'Opened');
 
-            $this->executeHooks($this->methodName, $caseID);
+            $this->executeHooks($caseID);
 
             /* If link from no head then reload. */
             if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true));
@@ -516,7 +516,7 @@ class testcase extends control
             ->fetch('count');
         $case->caseFails = $caseFails;
 
-        $this->executeHooks($this->methodName, $caseID);
+        $this->executeHooks($caseID);
 
         $this->view->position[] = $this->lang->testcase->common;
         $this->view->position[] = $this->lang->testcase->view;
@@ -569,7 +569,7 @@ class testcase extends control
                 $this->action->logHistory($actionID, $changes);
             }
 
-            $this->executeHooks($this->methodName, $caseID);
+            $this->executeHooks($caseID);
 
             die(js::locate($this->createLink('testcase', 'view', "caseID=$caseID"), 'parent'));
         }
@@ -781,7 +781,7 @@ class testcase extends control
             $result = $this->post->result;
             $this->loadModel('action')->create('case', $caseID, 'Reviewed', $this->post->comment, ucfirst($result));
 
-            $this->executeHooks($this->methodName, $caseID);
+            $this->executeHooks($caseID);
 
             die(js::reload('parent.parent'));
         }
@@ -827,7 +827,7 @@ class testcase extends control
         {
             $this->testcase->delete(TABLE_CASE, $caseID);
 
-            $this->executeHooks($this->methodName, $caseID);
+            $this->executeHooks($caseID);
 
             /* if ajax request, send result. */
             if($this->server->ajax)
diff --git a/module/testsuite/control.php b/module/testsuite/control.php
index 4b25be9332..cffacb98dd 100644
--- a/module/testsuite/control.php
+++ b/module/testsuite/control.php
@@ -89,7 +89,7 @@ class testsuite extends control
             }
             $actionID = $this->loadModel('action')->create('testsuite', $suiteID, 'opened');
 
-            $this->executeHooks($this->methodName, $suiteID);
+            $this->executeHooks($suiteID);
 
             $response['locate']  = $this->createLink('testsuite', 'browse', "productID=$productID");
             $response['message'] = $this->lang->testsuite->successSaved;
@@ -142,7 +142,7 @@ class testsuite extends control
         $this->app->loadClass('pager', $static = true);
         $pager = pager::init($recTotal, $recPerPage, $pageID);
 
-        $this->executeHooks($this->methodName, $suiteID);
+        $this->executeHooks($suiteID);
 
         $this->view->title      = "SUITE #$suite->id $suite->name/" . $this->products[$productID];
         $this->view->position[] = html::a($this->createLink('testsuite', 'browse', "productID=$productID"), $this->products[$productID]);
@@ -190,7 +190,7 @@ class testsuite extends control
                 $this->action->logHistory($actionID, $changes);
             }
 
-            $this->executeHooks($this->methodName, $suiteID);
+            $this->executeHooks($suiteID);
 
             $method = $suite->type == 'library' ? 'libView' : 'view';
             $response['locate']  = inlink($method, "suiteID=$suiteID");
@@ -252,7 +252,7 @@ class testsuite extends control
 
             $this->testsuite->delete($suiteID);
 
-            $this->executeHooks($this->methodName, $suiteID);
+            $this->executeHooks($suiteID);
 
             /* if ajax request, send result. */
             if($this->server->ajax)
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 85dd912a2e..28c2b795d6 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -106,7 +106,7 @@ class testtask extends control
             if(dao::isError()) die(js::error(dao::getError()));
             $this->loadModel('action')->create('testtask', $taskID, 'opened');
 
-            $this->executeHooks($this->methodName, $taskID);
+            $this->executeHooks($taskID);
 
             die(js::locate($this->createLink('testtask', 'browse', "productID=$productID"), 'parent'));
         }
@@ -216,7 +216,7 @@ class testtask extends control
 
         $this->testtask->setMenu($this->products, $productID, $task->branch, $taskID);
 
-        $this->executeHooks($this->methodName, $taskID);
+        $this->executeHooks($taskID);
 
         $this->view->title      = "TASK #$task->id $task->name/" . $this->products[$productID];
         $this->view->position[] = html::a($this->createLink('testtask', 'browse', "productID=$productID"), $this->products[$productID]);
@@ -464,7 +464,7 @@ class testtask extends control
                 $this->action->logHistory($actionID, $changes);
             }
 
-            $this->executeHooks($this->methodName, $taskID);
+            $this->executeHooks($taskID);
 
             die(js::locate(inlink('view', "taskID=$taskID"), 'parent'));
         }
@@ -512,7 +512,7 @@ class testtask extends control
                 $this->action->logHistory($actionID, $changes);
             }
 
-            $this->executeHooks($this->methodName, $taskID);
+            $this->executeHooks($taskID);
 
             if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('testtask', 'view', "taskID=$taskID")));
@@ -555,7 +555,7 @@ class testtask extends control
                 $this->action->logHistory($actionID, $changes);
             }
 
-            $this->executeHooks($this->methodName, $taskID);
+            $this->executeHooks($taskID);
 
             if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent')); 
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('testtask', 'view', "taskID=$taskID")));
@@ -598,7 +598,7 @@ class testtask extends control
                 $this->action->logHistory($actionID, $changes);
             }
 
-            $this->executeHooks($this->methodName, $taskID);
+            $this->executeHooks($taskID);
 
             if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
             $this->send(array('result' => 'success', 'message' => $this->lang->success, 'locate' => $this->createLink('testtask', 'view', "taskID=$taskID")));
@@ -643,7 +643,7 @@ class testtask extends control
                 $this->action->logHistory($actionID, $changes);
             }
 
-            $this->executeHooks($this->methodName, $taskID);
+            $this->executeHooks($taskID);
 
             if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('testtask', 'view', "taskID=$taskID")));
@@ -683,7 +683,7 @@ class testtask extends control
             $task = $this->testtask->getByID($taskID);
             $this->testtask->delete(TABLE_TESTTASK, $taskID);
 
-            $this->executeHooks($this->methodName, $taskID);
+            $this->executeHooks($taskID);
 
             /* if ajax request, send result. */
             if($this->server->ajax)

From aac0ce255498f22c37eb95681046d6587e7d8435 Mon Sep 17 00:00:00 2001
From: jinianlan <jinianlan@qq.com>
Date: Thu, 25 Jul 2019 17:57:15 +0800
Subject: [PATCH 7/9] * fix Bug #2656,#2653

---
 module/bug/view/browse.html.php | 8 ++++----
 module/common/model.php         | 5 -----
 module/story/model.php          | 2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index c742e1d877..2200451782 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -241,18 +241,18 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
               <?php
               $class = "class='disabled'";
               $actionLink = $this->createLink('bug', 'batchConfirm');
-              $misc = (common::hasPriv('bug', 'batchConfirm') && common::hasPriv('bug','confirmBug')) ? "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"" : "";
+              $misc = common::hasPriv('bug', 'batchConfirm') ? "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"" : $class;
               if($misc) echo "<li>" . html::a('javascript:;', $lang->bug->confirmBug, '', $misc) . "</li>";
 
               $actionLink = $this->createLink('bug', 'batchClose');
-              $misc = (common::hasPriv('bug', 'batchClose') && common::hasPriv('bug','close')) ? "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"" : "";
+              $misc = common::hasPriv('bug', 'batchClose') ? "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"" : $class;
               if($misc) echo "<li>" . html::a('javascript:;', $lang->bug->close, '', $misc) . "</li>";
 
               $actionLink = $this->createLink('bug', 'batchActivate', "productID=$productID&branch=$branch");
-              $misc = (common::hasPriv('bug', 'batchActivate') && common::hasPriv('bug','activate')) ? "onclick=\"setFormAction('$actionLink')\"" : "";
+              $misc = common::hasPriv('bug', 'batchActivate') ? "onclick=\"setFormAction('$actionLink')\"" : $class;
               if($misc) echo "<li>" . html::a('javascript:;', $lang->bug->activate, '', $misc) . "</li>";
 
-              $misc = (common::hasPriv('bug', 'batchResolve') && common::hasPriv('bug','resolve')) ? "id='resolveItem'" : '';
+              $misc = common::hasPriv('bug', 'batchResolve') ? "id='resolveItem'" : '';
               if($misc)
               {
                   echo "<li class='dropdown-submenu'>" . html::a('javascript:;', $lang->bug->resolve,  '', $misc);
diff --git a/module/common/model.php b/module/common/model.php
index ce4d799aed..9f63cd4a6b 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -1183,11 +1183,6 @@ EOD;
         $orderBy = $this->session->$orderBy;
         if(empty($queryCondition) or $this->session->$typeOnlyCondition)
         {
-            if($type='story')
-            {
-                $queryCondition=false;
-                $orderBy=false;
-            }
             $queryObjects = $this->dao->select('*')->from($table)->where('id')->eq($objectID)
                 ->beginIF($queryCondition != false)->orWhere($queryCondition)->fi()
                 ->beginIF($orderBy != false)->orderBy($orderBy)->fi()
diff --git a/module/story/model.php b/module/story/model.php
index 72b48fa363..886b8c20fd 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -1870,7 +1870,7 @@ class storyModel extends model
             ->page($pager)
             ->fetchAll();
 
-        $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'story');
+        $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'story', false);
         $productIdList = array();
         foreach($stories as $story) $productIdList[$story->product] = $story->product;
 

From 1e7386530378e316b5037a949eb7b4e8a89588a0 Mon Sep 17 00:00:00 2001
From: liugang <liugang@cnezsoft.com>
Date: Fri, 26 Jul 2019 08:49:55 +0800
Subject: [PATCH 8/9] * Change flowModel::printFields to
 control::printExtendFields.

---
 module/task/view/edit.html.php     | 4 ++--
 module/testcase/view/edit.html.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index 5162fd43e5..09e99811e3 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -217,7 +217,7 @@
               </tr>
             </table>
           </div>
-          <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'div', 'position=right&divCell=false');?>
+          <?php $this->printExtendFields($task, 'div', 'position=right&divCell=false');?>
         </div>
       </div>
     </div>
@@ -276,7 +276,7 @@
             </tfoot>
           </table>
         </div>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'div', 'position=left&divCell=false');?>
+        <?php $this->printExtendFields($task, 'div', 'position=left&divCell=false');?>
       </div>
     </div>
   </form>
diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php
index 835c144d15..40d60dc641 100644
--- a/module/testcase/view/edit.html.php
+++ b/module/testcase/view/edit.html.php
@@ -247,7 +247,7 @@
               <?php endif;?>
             </table>
           </div>
-          <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'div', 'position=right&divCell=false');?>
+          <?php $this->printExtendFields($case, 'div', 'position=right&divCell=false');?>
           <div class='detail'>
             <div class='detail-title'><?php echo $lang->testcase->legendOpenAndEdit;?></div>
             <table class='table table-form'>

From e8d577ec6802742f13bcefeb491f890b00ba4189 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Fri, 26 Jul 2019 14:34:07 +0800
Subject: [PATCH 9/9] * Finish task #8340.

---
 module/block/js/admin.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/module/block/js/admin.js b/module/block/js/admin.js
index 1a494f030f..b0f3363e4f 100644
--- a/module/block/js/admin.js
+++ b/module/block/js/admin.js
@@ -4,7 +4,6 @@ $(function()
     var preValue   = '';
     $(document).on('change', '#blockParams #paramstype', function()
     {
-        console.log(preValue);
         $title = $('#blockParams').find('#title');
         var value = $(this).find('option:selected').html();
         if($title.val().indexOf(blockTitle + ' - ' + preValue) >= 0) $title.val(blockTitle + ' - ' + value);