From 71a16a309307a28332a10fb91057c2de3968617d Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Thu, 5 Aug 2021 10:54:31 +0800 Subject: [PATCH] * Adjust the doc module link in drop menu. --- module/doc/model.php | 2 +- module/execution/model.php | 5 ++++- module/product/model.php | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/module/doc/model.php b/module/doc/model.php index 9ec28509f3..360c777d88 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -2306,7 +2306,7 @@ EOT; if($libID == 0) $libID = key($libs); $this->lang->modulePageNav = $this->select($type, $objects, $objectID, $libs, $libID); - $this->app->rawMethod = $type; + if($this->app->openApp == 'doc') $this->app->rawMethod = $type; $object = $this->dao->select('id,name,status')->from($table)->where('id')->eq($objectID)->fetch(); if(empty($object)) die(js::locate(helper::createLink($type, 'create'))); diff --git a/module/execution/model.php b/module/execution/model.php index c5301e4413..0e416d6bb5 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -1300,7 +1300,10 @@ class executionModel extends model $link = helper::createLink($module, $method, "executionID=%s"); } - if($module == 'doc') $link = helper::createLink('doc', 'objectLibs', "type=execution&objectID=%s&from=execution"); + if($module == 'doc') + { + $link = helper::createLink('doc', $method, "type=execution&objectID=%s&from=execution"); + } return $link; } diff --git a/module/product/model.php b/module/product/model.php index fee25cb4c4..ef6dccf915 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -1785,7 +1785,7 @@ class productModel extends model } else if($module == 'doc') { - $link = helper::createLink('doc', 'objectLibs', "type=product&objectID=%s&from=product"); + $link = helper::createLink('doc', $method, "type=product&objectID=%s&from=product"); } elseif($module == 'design') {