From 8bc8979c20e3a4a46a4012316e20157099681540 Mon Sep 17 00:00:00 2001 From: lanzongjun Date: Fri, 1 Jul 2022 10:59:06 +0800 Subject: [PATCH 1/2] * fix bug #24071 --- .../product/ext/view/browse.lite.html.hook.php | 7 +++++++ module/story/model.php | 18 ++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 extension/lite/product/ext/view/browse.lite.html.hook.php diff --git a/extension/lite/product/ext/view/browse.lite.html.hook.php b/extension/lite/product/ext/view/browse.lite.html.hook.php new file mode 100644 index 0000000000..d7ac1acc67 --- /dev/null +++ b/extension/lite/product/ext/view/browse.lite.html.hook.php @@ -0,0 +1,7 @@ + diff --git a/module/story/model.php b/module/story/model.php index a667e0c34f..c15daa31ea 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -3844,13 +3844,11 @@ class storyModel extends model if(common::canBeChanged('story', $story)) { $storyReviewer = isset($story->reviewer) ? $story->reviewer : array(); - if($story->URChanged) return $this->buildMenu('story', 'processStoryChange', $params, $story, $type, 'search', '', 'iframe', true, '', $this->lang->confirm); $isClick = $this->isClickable($story, 'change'); $title = $isClick ? '' : $this->lang->story->changeTip; - $menu .= $this->buildMenu('story', 'change', $params . "&from=$story->from", $story, $type, 'alter', '', '', false, '', $title); - + $menu .= $this->buildMenu('story', 'change', $params . "&from=$story->from", $story, $type, 'alter', '', 'showinonlybody', false, '', $title); $isClick = $this->isClickable($story, 'review'); $title = $this->lang->story->review; if(!$isClick) @@ -3872,8 +3870,7 @@ class storyModel extends model $title = $this->lang->story->reviewTip['recalled']; } } - $menu .= $this->buildMenu('story', 'review', $params . "&from=$story->from", $story, $type, 'search', '', '', false, '', $title); - + $menu .= $this->buildMenu('story', 'review', $params . "&from=$story->from", $story, $type, 'search', '', 'showinonlybody', false, '', $title); $title = $this->lang->story->recall; $isClick = $this->isClickable($story, 'recall'); if(!$isClick) @@ -3883,11 +3880,11 @@ class storyModel extends model if(empty($story->reviewedBy) and strpos('draft,changed', $story->status) !== false and !empty($story->reviewer) and $this->app->user->account != $story->openedBy) $title = $this->lang->story->recallTip['notOpenedBy']; if($story->status == 'active' and empty($story->reviewer)) $title = $this->lang->story->recallTip['actived']; } - $menu .= $this->buildMenu('story', 'recall', $params, $story, $type, 'undo', 'hiddenwin', '', '', '', $title); + $menu .= $this->buildMenu('story', 'recall', $params, $story, $type, 'undo', 'hiddenwin', 'showinonlybody', '', '', $title); $menu .= $this->buildMenu('story', 'close', $params, $story, $type, '', '', 'iframe', true); - $menu .= $this->buildMenu('story', 'edit', $params . "&from=$story->from", $story, $type); - if($story->type != 'requirement' and $this->config->vision != 'lite') $menu .= $this->buildMenu('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=¶m=0&$params", $story, $type, 'sitemap', '', '', false, "data-app='qa'"); + $menu .= $this->buildMenu('story', 'edit', $params . "&from=$story->from", $story, $type, '', '', 'showinonlybody'); + if($story->type != 'requirement' and $this->config->vision != 'lite') $menu .= $this->buildMenu('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=¶m=0&$params", $story, $type, 'sitemap', '', 'showinonlybody', false, "data-app='qa'"); if($this->app->rawModule != 'projectstory' OR $this->config->vision == 'lite') { @@ -3906,9 +3903,10 @@ class storyModel extends model if($story->stage == 'projected') $title = $this->lang->story->subDivideTip['projected']; } } - $menu .= $this->buildMenu('story', 'batchCreate', "productID=$story->product&branch=$story->branch&module=$story->module&$params&executionID={$this->session->project}", $story, $type, 'split', '', '', '', '', $title); + $menu .= $this->buildMenu('story', 'batchCreate', "productID=$story->product&branch=$story->branch&module=$story->module&$params&executionID={$this->session->project}", $story, $type, 'split', '', 'showinonlybody', '', '', $title); } - if($this->app->rawModule == 'projectstory' and $this->config->vision != 'lite') $menu .= $this->buildMenu('projectstory', 'unlinkStory', "projectID={$this->session->project}&$params", $story, $type, 'unlink', 'hiddenwin'); + if($this->app->rawModule == 'projectstory' and $this->config->vision != 'lite') $menu .= $this->buildMenu('projectstory', 'unlinkStory', "projectID={$this->session->project}&$params", $story, $type, 'unlink', 'hiddenwin', 'showinonlybody'); + } else { From dd30f6354b3086b988bca918f245f30f3762345b Mon Sep 17 00:00:00 2001 From: lanzongjun Date: Fri, 1 Jul 2022 11:28:58 +0800 Subject: [PATCH 2/2] * fix bug #24071 --- extension/lite/product/ext/view/browse.lite.html.hook.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/extension/lite/product/ext/view/browse.lite.html.hook.php b/extension/lite/product/ext/view/browse.lite.html.hook.php index d7ac1acc67..df267790ba 100644 --- a/extension/lite/product/ext/view/browse.lite.html.hook.php +++ b/extension/lite/product/ext/view/browse.lite.html.hook.php @@ -1,7 +1,3 @@