From cd6698cc9b2609fc38f9fd28688dada5769613bc Mon Sep 17 00:00:00 2001 From: daitingting Date: Wed, 18 May 2022 07:38:45 +0000 Subject: [PATCH] * Add relations params for buildActionMenu. --- framework/model.class.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/framework/model.class.php b/framework/model.class.php index c1960e4f7c..aa59671506 100644 --- a/framework/model.class.php +++ b/framework/model.class.php @@ -144,6 +144,7 @@ class model extends baseModel if(strpos($module, '.') !== false) list($appName, $moduleName) = explode('.', $module); static $actions; + static $relations; if(empty($actions)) { $actions = $this->dao->select('*')->from(TABLE_WORKFLOWACTION) @@ -154,6 +155,7 @@ class model extends baseModel ->orderBy('order_asc') ->fetchAll(); } + if(empty($relations)) $relations = $this->dao->select('next, actions')->from(TABLE_WORKFLOWRELATION)->where('prev')->eq($moduleName)->fetchPairs(); $menu = ''; if($show) @@ -162,7 +164,7 @@ class model extends baseModel { if(strpos($action->position, $type) === false || $action->show != $show) continue; - $menu .= $this->loadModel('flow')->buildActionMenu($moduleName, $action, $data, $type); + $menu .= $this->loadModel('flow')->buildActionMenu($moduleName, $action, $data, $type, $relations); } } else @@ -172,8 +174,8 @@ class model extends baseModel { if(strpos($action->position, $type) === false) continue; - if($type == 'view' || $action->show == 'direct') $menu .= $this->loadModel('flow')->buildActionMenu($moduleName, $action, $data, $type); - if($type == 'browse' && $action->show == 'dropdownlist') $dropdownMenu .= $this->loadModel('flow')->buildActionMenu($moduleName, $action, $data, $type); + if($type == 'view' || $action->show == 'direct') $menu .= $this->loadModel('flow')->buildActionMenu($moduleName, $action, $data, $type, $relations); + if($type == 'browse' && $action->show == 'dropdownlist') $dropdownMenu .= $this->loadModel('flow')->buildActionMenu($moduleName, $action, $data, $type, $relations); } if($type == 'browse' && $dropdownMenu)