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

* adjust for task #56614.

Browse Source
This commit is contained in:
wangyidong
2022-06-09 13:49:54 +08:00
parent f3f8e20c9b
commit f9a14f40d4
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
framework/router.class.php
View File

@@ -521,7 +521,7 @@ class router extends baseRouter
if($moduleName == 'flow' and $methodName == 'browse')
{
$mode = 'browse';
if(count($params) > 0) $mode = array_shift($params);
if(count($params) > 0 and !is_numeric($params[0])) $mode = array_shift($params);
array_unshift($params, $mode);
}
@@ -546,9 +546,13 @@ class router extends baseRouter
if($moduleName == 'flow' and $methodName == 'browse')
{
$mode = 'browse';
if(count($params) > 0) $mode = array_pop($params);
$mode = zget($params, 'mode', 'browse');
if(is_numeric($mode)) $mode = 'browse';
$params['mode'] = $mode;
$get = array_reverse($_GET);
$get['mode'] = $mode;
$_GET = array_reverse($get);
}
$params[$this->config->methodVar] = $methodName; // $param = array('id' => 1, 'f' => 'operate');
$params[$this->config->moduleVar] = $moduleName; // $param = array('id' => 1, 'f' => 'operate', 'm' => 'flow');

3
module/upgrade/model.php
View File

@@ -652,6 +652,9 @@ class upgradeModel extends model
case 'biz7.0.beta1':
$this->processViewFields();
break;
case 'biz7.0':
$this->processFlowPosition();
break;
}
}