Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

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

Browse Source
This commit is contained in:
wangyidong
2019-10-22 10:27:30 +08:00
parent d6d649bdb4 d7144680fc
commit 0ae8d11d71
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/router.class.php
+14 -8
View File
@@ -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
{
module/doc/lang/en.php
+1 -1
View File
@@ -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';