From 82f1ce5baebcac479f11e1d277d42257bde4f306 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 22 Feb 2024 17:09:44 +0800 Subject: [PATCH] * Fix bug #46099, and fix bug of menu. --- module/project/model.php | 2 +- module/project/ui/view.html.php | 1 + module/tutorial/model.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/module/project/model.php b/module/project/model.php index b200b02c42..3accd13983 100755 --- a/module/project/model.php +++ b/module/project/model.php @@ -2070,7 +2070,7 @@ class projectModel extends model if(!$this->loadModel('common')->isOpenMethod($moduleName, $methodName) and !commonModel::hasPriv($moduleName, $methodName)) $this->common->deny($moduleName, $methodName, false); $projectID = (int)$this->checkAccess($projectID, $this->getPairsByProgram()); - $project = $this->projectTao->fetchProjectInfo($projectID); + $project = commonModel::isTutorialMode() ? $this->loadModel('tutorial')->getProject() : $this->projectTao->fetchProjectInfo($projectID); if(!$project) return false; /* Reset project priv. */ diff --git a/module/project/ui/view.html.php b/module/project/ui/view.html.php index dd8c3d003e..e5b8069301 100644 --- a/module/project/ui/view.html.php +++ b/module/project/ui/view.html.php @@ -696,6 +696,7 @@ div setClass('mt-4'), history ( + set::objectID($project->id), set::commentUrl(createLink('action', 'comment', array('objectType' => 'project', 'objectID' => $project->id))), set::bodyClass('maxh-80 overflow-y-auto') ) diff --git a/module/tutorial/model.php b/module/tutorial/model.php index 582a230331..f7815ac6df 100644 --- a/module/tutorial/model.php +++ b/module/tutorial/model.php @@ -164,7 +164,7 @@ class tutorialModel extends model $project->displayCards = 0; $project->fluidBoard = 0; $project->deleted = '0'; - $project->hasProduct = '1'; + $project->hasProduct = 1; $project->multiple = '1'; $project->stageBy = 'project';