diff --git a/framework/router.class.php b/framework/router.class.php index aa9f5c5b4c..7f0541813c 100755 --- a/framework/router.class.php +++ b/framework/router.class.php @@ -346,11 +346,16 @@ class router extends baseRouter $this->loadModuleConfig('workflowaction'); $moduleName = 'flow'; + $methodName = $this->methodName; /* - * 工作流中除了browse、create、edit、view、delete、export外其他的方法都调用operate方法来执行。 - * In addition to browse, create, edit, view, delete and export, all methods in the workflow call the operate method to execute. + * 工作流中除了内置方法外的方法,如果是批量操作调用batchOperate方法,其它操作调用operate方法来执行。 + * In addition to the built-in methods in the workflow, if the batch operation calls the batchOperate method, other operations call the operate method to execute. */ - $methodName = in_array($this->methodName, $this->config->workflowaction->default->actions) ? $this->methodName : 'operate'; + if(!in_array($this->methodName, $this->config->workflowaction->default->actions)) + { + if($action->type == 'single') $methodName = 'operate'; + if($action->type == 'batch') $methodName = 'batchOperate'; + } $this->setFlowURI($moduleName, $methodName); } @@ -397,12 +402,13 @@ class router extends baseRouter $params = array_slice($params, 2); // $params = array(1); /* Prepend other params. */ - if($methodName == 'operate') array_unshift($params, $this->rawMethod); // $params = array('close', 1); - array_unshift($params, $this->rawModule); // $params = array($module, 'close', 1); - array_unshift($params, $methodName); // $params = array('operate', $module, 'close', 1); - array_unshift($params, $moduleName); // $params = array('flow', 'operate', $module, 'close', 1); + if($methodName == 'operate') array_unshift($params, $this->rawMethod); // $params = array('close', 1); + if($methodName == 'batchOperate') array_unshift($params, $this->rawMethod); // $params = array('close', 1); + array_unshift($params, $this->rawModule); // $params = array($module, 'close', 1); + array_unshift($params, $methodName); // $params = array('operate', $module, 'close', 1); + array_unshift($params, $moduleName); // $params = array('flow', 'operate', $module, 'close', 1); - $this->URI = implode($this->config->requestFix, $params); // $this->URI = flow-operate-$module-close-1.html; + $this->URI = implode($this->config->requestFix, $params); // $this->URI = flow-operate-$module-close-1.html; } else { diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index b2839584e5..3c42b4b086 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -52,7 +52,7 @@ $lang->doc->retrack = 'Retrack'; $lang->doc->moduleDoc = 'By Module'; $lang->doc->searchDoc = 'Search'; -$lang->doc->fast = 'Qucik Entry'; +$lang->doc->fast = 'Quick Entry'; $lang->doc->allDoc = 'All Documents'; $lang->doc->openedByMe = 'My'; $lang->doc->orderByOpen = 'Recent Added';