From 83bd049eccee6477bf41f7f32ab069dd257109f9 Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Thu, 12 Sep 2024 16:08:18 +0800 Subject: [PATCH] * [bug#55101] Hide the mode of not have in tutorial. --- module/story/model.php | 8 ++- module/tutorial/config/productManage.php | 61 +++++++++-------- module/tutorial/config/scrumProjectManage.php | 2 +- module/tutorial/config/starter.php | 67 ++++++++++--------- module/tutorial/config/zenguides.php | 24 +++---- module/tutorial/model.php | 10 +-- 6 files changed, 91 insertions(+), 81 deletions(-) diff --git a/module/story/model.php b/module/story/model.php index 1abac583d7..24843d7840 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -130,8 +130,12 @@ class storyModel extends model if(common::isTutorialMode()) { - $story = $this->loadModel('tutorial')->getStory(); - return array($story->id => $story); + $stories = $this->loadModel('tutorial')->getStories(); + foreach($stories as $story) + { + if(!in_array($story->id, $storyIdList)) unset($stories[$story->id]); + } + return $stories; } return $this->dao->select('t1.*, t2.spec, t2.verify, t3.name as productTitle, t3.deleted as productDeleted') diff --git a/module/tutorial/config/productManage.php b/module/tutorial/config/productManage.php index 11b28c73f5..b00dc33ce1 100644 --- a/module/tutorial/config/productManage.php +++ b/module/tutorial/config/productManage.php @@ -484,39 +484,42 @@ $productManage->advance->modules = 'product,tree,story,productplan,release'; $productManage->advance->app = 'product'; $productManage->advance->tasks = array(); -$productManage->advance->tasks['lineManage'] = array(); -$productManage->advance->tasks['lineManage']['name'] = 'lineManage'; -$productManage->advance->tasks['lineManage']['title'] = $lang->tutorial->productManage->lineManage->title; -$productManage->advance->tasks['lineManage']['startUrl'] = array('product', 'all'); -$productManage->advance->tasks['lineManage']['steps'] = array(); +if($config->systemMode != 'light') +{ + $productManage->advance->tasks['lineManage'] = array(); + $productManage->advance->tasks['lineManage']['name'] = 'lineManage'; + $productManage->advance->tasks['lineManage']['title'] = $lang->tutorial->productManage->lineManage->title; + $productManage->advance->tasks['lineManage']['startUrl'] = array('product', 'all'); + $productManage->advance->tasks['lineManage']['steps'] = array(); -$productManage->advance->tasks['lineManage']['steps'][] = array( - 'type' => 'openApp', - 'app' => 'product', - 'title' => $lang->tutorial->productManage->lineManage->step1->name, - 'desc' => $lang->tutorial->productManage->lineManage->step1->desc -); + $productManage->advance->tasks['lineManage']['steps'][] = array( + 'type' => 'openApp', + 'app' => 'product', + 'title' => $lang->tutorial->productManage->lineManage->step1->name, + 'desc' => $lang->tutorial->productManage->lineManage->step1->desc + ); -$productManage->advance->tasks['lineManage']['steps'][] = array( - 'type' => 'click', - 'target' => '#actionBar button[data-id="manageLineModal"]', - 'page' => 'product-all', - 'title' => $lang->tutorial->productManage->lineManage->step2->name, - 'desc' => $lang->tutorial->productManage->lineManage->step2->desc -); + $productManage->advance->tasks['lineManage']['steps'][] = array( + 'type' => 'click', + 'target' => '#actionBar button[data-id="manageLineModal"]', + 'page' => 'product-all', + 'title' => $lang->tutorial->productManage->lineManage->step2->name, + 'desc' => $lang->tutorial->productManage->lineManage->step2->desc + ); -$productManage->advance->tasks['lineManage']['steps'][] = array( - 'type' => 'form', - 'page' => 'product-all', - 'title' => $lang->tutorial->productManage->lineManage->step3->name -); + $productManage->advance->tasks['lineManage']['steps'][] = array( + 'type' => 'form', + 'page' => 'product-all', + 'title' => $lang->tutorial->productManage->lineManage->step3->name + ); -$productManage->advance->tasks['lineManage']['steps'][] = array( - 'type' => 'saveForm', - 'page' => 'product-all', - 'title' => $lang->tutorial->productManage->lineManage->step4->name, - 'desc' => $lang->tutorial->productManage->lineManage->step4->desc -); + $productManage->advance->tasks['lineManage']['steps'][] = array( + 'type' => 'saveForm', + 'page' => 'product-all', + 'title' => $lang->tutorial->productManage->lineManage->step4->name, + 'desc' => $lang->tutorial->productManage->lineManage->step4->desc + ); +} $productManage->advance->tasks['addProduct'] = $productManage->basic->tasks['addProduct']; $productManage->advance->tasks['moduleManage'] = $productManage->basic->tasks['moduleManage']; diff --git a/module/tutorial/config/scrumProjectManage.php b/module/tutorial/config/scrumProjectManage.php index 13afdb4978..197abbc725 100644 --- a/module/tutorial/config/scrumProjectManage.php +++ b/module/tutorial/config/scrumProjectManage.php @@ -708,7 +708,7 @@ $scrumProjectManage->advance = clone $scrumProjectManage->basic; $scrumProjectManage->advance->name = 'scrumProjectManageAdvance'; $scrumProjectManage->advance->type = 'advance'; -if(in_array($config->edition, array('max', 'ipd'))) +if(in_array($config->edition, array('max', 'ipd')) && $config->systemMode != 'light') { $scrumProjectManage->advance->tasks['manageIssue'] = array(); $scrumProjectManage->advance->tasks['manageIssue']['name'] = 'manageIssue'; diff --git a/module/tutorial/config/starter.php b/module/tutorial/config/starter.php index 1b03464172..8e9b47a657 100644 --- a/module/tutorial/config/starter.php +++ b/module/tutorial/config/starter.php @@ -1,5 +1,5 @@ name = 'starter'; @@ -59,40 +59,43 @@ $starter->tasks['createAccount']['steps'][] = array( 'desc' => $lang->tutorial->starter->createAccount->step6->desc ); -$starter->tasks['createProgram'] = array(); -$starter->tasks['createProgram']['name'] = 'createProgram'; -$starter->tasks['createProgram']['title'] = $lang->tutorial->starter->createProgram->title; -$starter->tasks['createProgram']['startUrl'] = array('program', 'browse'); -$starter->tasks['createProgram']['steps'] = array(); +if($config->systemMode != 'light') +{ + $starter->tasks['createProgram'] = array(); + $starter->tasks['createProgram']['name'] = 'createProgram'; + $starter->tasks['createProgram']['title'] = $lang->tutorial->starter->createProgram->title; + $starter->tasks['createProgram']['startUrl'] = array('program', 'browse'); + $starter->tasks['createProgram']['steps'] = array(); -$starter->tasks['createProgram']['steps'][] = array( - 'type' => 'openApp', - 'app' => 'program', - 'title' => $lang->tutorial->starter->createProgram->step1->name, - 'desc' => $lang->tutorial->starter->createProgram->step1->desc -); + $starter->tasks['createProgram']['steps'][] = array( + 'type' => 'openApp', + 'app' => 'program', + 'title' => $lang->tutorial->starter->createProgram->step1->name, + 'desc' => $lang->tutorial->starter->createProgram->step1->desc + ); -$starter->tasks['createProgram']['steps'][] = array( - 'type' => 'click', - 'target' => '#actionBar a.create-program-btn', - 'page' => 'program-browse', - 'app' => 'program', - 'title' => $lang->tutorial->starter->createProgram->step2->name, - 'desc' => $lang->tutorial->starter->createProgram->step2->desc -); + $starter->tasks['createProgram']['steps'][] = array( + 'type' => 'click', + 'target' => '#actionBar a.create-program-btn', + 'page' => 'program-browse', + 'app' => 'program', + 'title' => $lang->tutorial->starter->createProgram->step2->name, + 'desc' => $lang->tutorial->starter->createProgram->step2->desc + ); -$starter->tasks['createProgram']['steps'][] = array( - 'type' => 'form', - 'page' => 'program-create', - 'title' => $lang->tutorial->starter->createProgram->step3->name -); + $starter->tasks['createProgram']['steps'][] = array( + 'type' => 'form', + 'page' => 'program-create', + 'title' => $lang->tutorial->starter->createProgram->step3->name + ); -$starter->tasks['createProgram']['steps'][] = array( - 'type' => 'saveForm', - 'page' => 'program-create', - 'title' => $lang->tutorial->starter->createProgram->step4->name, - 'desc' => $lang->tutorial->starter->createProgram->step4->desc -); + $starter->tasks['createProgram']['steps'][] = array( + 'type' => 'saveForm', + 'page' => 'program-create', + 'title' => $lang->tutorial->starter->createProgram->step4->name, + 'desc' => $lang->tutorial->starter->createProgram->step4->desc + ); +} $starter->tasks['createProduct'] = array(); $starter->tasks['createProduct']['name'] = 'createProduct'; @@ -364,7 +367,7 @@ $starter->tasks['linkStory']['steps'][] = array( $starter->tasks['linkStory']['steps'][] = array( 'type' => 'selectRow', - 'target' => 'div.dtable div.dtable-body div[data-col="id"][data-row="3"]', + 'target' => 'div.dtable div.dtable-body div[data-col="id"][data-row="4"]', 'page' => 'execution-linkstory', 'title' => $lang->tutorial->starter->linkStory->step4->name ); diff --git a/module/tutorial/config/zenguides.php b/module/tutorial/config/zenguides.php index 6bf7f4aed3..24e259e6d9 100644 --- a/module/tutorial/config/zenguides.php +++ b/module/tutorial/config/zenguides.php @@ -9,20 +9,20 @@ if($app->config->vision === 'rnd') $config->tutorial->guides[$starter->name] = $starter; /* Basic tutorial. */ - $config->tutorial->guides[$accountManage->name] = $accountManage; - $config->tutorial->guides[$productManage->basic->name] = $productManage->basic; - $config->tutorial->guides[$scrumProjectManage->basic->name] = $scrumProjectManage->basic; - $config->tutorial->guides[$waterfallProjectManage->basic->name] = $waterfallProjectManage->basic; - $config->tutorial->guides[$kanbanProjectManage->basic->name] = $kanbanProjectManage->basic; - $config->tutorial->guides[$taskManage->name] = $taskManage; - $config->tutorial->guides[$testManage->name] = $testManage; + $config->tutorial->guides[$accountManage->name] = $accountManage; + $config->tutorial->guides[$productManage->basic->name] = $productManage->basic; + $config->tutorial->guides[$scrumProjectManage->basic->name] = $scrumProjectManage->basic; + if($config->systemMode != 'light') $config->tutorial->guides[$waterfallProjectManage->basic->name] = $waterfallProjectManage->basic; + $config->tutorial->guides[$kanbanProjectManage->basic->name] = $kanbanProjectManage->basic; + $config->tutorial->guides[$taskManage->name] = $taskManage; + $config->tutorial->guides[$testManage->name] = $testManage; /* Advance tutorial. */ - $config->tutorial->guides[$programManage->name] = $programManage; - $config->tutorial->guides[$productManage->advance->name] = $productManage->advance; - $config->tutorial->guides[$scrumProjectManage->advance->name] = $scrumProjectManage->advance; - $config->tutorial->guides[$waterfallProjectManage->advance->name] = $waterfallProjectManage->advance; - $config->tutorial->guides[$kanbanProjectManage->advance->name] = $kanbanProjectManage->advance; + if($config->systemMode != 'light') $config->tutorial->guides[$programManage->name] = $programManage; + $config->tutorial->guides[$productManage->advance->name] = $productManage->advance; + $config->tutorial->guides[$scrumProjectManage->advance->name] = $scrumProjectManage->advance; + if($config->systemMode != 'light') $config->tutorial->guides[$waterfallProjectManage->advance->name] = $waterfallProjectManage->advance; + $config->tutorial->guides[$kanbanProjectManage->advance->name] = $kanbanProjectManage->advance; if($app->config->edition != 'open') $config->tutorial->guides[$feedbackManage->name] = $feedbackManage; $config->tutorial->guides[$docManage->name] = $docManage; } diff --git a/module/tutorial/model.php b/module/tutorial/model.php index 0552d5cbd1..5fd37b7377 100644 --- a/module/tutorial/model.php +++ b/module/tutorial/model.php @@ -507,12 +507,12 @@ class tutorialModel extends model $reviewingStory->path = ',1,2,4,'; $stories = array(); - $stories[] = $this->getEpic(); - $stories[] = $this->getRequirement(); + $stories[1] = $this->getEpic(); + $stories[2] = $this->getRequirement(); if($this->app->config->vision == 'rnd') { - $stories[] = $activeStory; - $stories[] = $reviewingStory; + $stories[3] = $activeStory; + $stories[4] = $reviewingStory; } if($this->app->config->vision == 'or') { @@ -523,7 +523,7 @@ class tutorialModel extends model $reviewingRequirement->title = 'Test reviewing requirement'; $reviewingRequirement->path = ',1,5,'; $reviewingRequirement->isParent = 0; - $stories[] = $reviewingRequirement; + $stories[5] = $reviewingRequirement; } return $stories; }