From b5a9fe8c529d72a2ee44581157b586ca7316fa7f Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 14 Jul 2022 09:57:56 +0800 Subject: [PATCH] * Fix bug #25234,25233. --- module/common/model.php | 2 +- module/project/control.php | 2 +- module/project/view/create.html.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module/common/model.php b/module/common/model.php index 02409185ed..70b7953001 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -633,7 +633,7 @@ class commonModel extends model } else if(!defined('TUTORIAL')) { - $params = "programID=0©ProjectID=0&extra=from=global"; + $params = "programID=0&extra=from=global"; $createMethod = 'createGuide'; $attr = 'data-toggle="modal"'; } diff --git a/module/project/control.php b/module/project/control.php index c039a63e8e..89a15dea38 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -501,7 +501,7 @@ class project extends control } if($this->app->tab == 'doc') unset($this->lang->doc->menu->project['subMenu']); - if($this->app->tab == 'product' and isset($output['productID'])) $this->loadModel('product')->setMenu($output['productID']); + if($this->app->tab == 'product' and !empty($output['productID'])) $this->loadModel('product')->setMenu($output['productID']); $topProgramID = $this->program->getTopByID($programID); diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index 0680873efb..4c1e257bba 100755 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -43,7 +43,7 @@ - app->tab == 'product' ? 'disabled' : '';?> + app->tab == 'product' and $productID) ? 'disabled' : '';?>
project->parent;?>