From fa823c4c322ece7453af73bb4ba98705ca7f4270 Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Thu, 26 May 2022 08:44:23 +0000 Subject: [PATCH] * Fix bug #23001,23005. --- .../lite/execution/ext/view/treestory.lite.html.hook.php | 3 +++ extension/lite/execution/ext/view/treetask.lite.html.hook.php | 3 +++ extension/lite/story/ext/view/view.html.php | 4 +--- extension/lite/task/ext/view/batchcreate.html.php | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 extension/lite/execution/ext/view/treestory.lite.html.hook.php create mode 100644 extension/lite/execution/ext/view/treetask.lite.html.hook.php diff --git a/extension/lite/execution/ext/view/treestory.lite.html.hook.php b/extension/lite/execution/ext/view/treestory.lite.html.hook.php new file mode 100644 index 0000000000..89812e9f87 --- /dev/null +++ b/extension/lite/execution/ext/view/treestory.lite.html.hook.php @@ -0,0 +1,3 @@ + diff --git a/extension/lite/execution/ext/view/treetask.lite.html.hook.php b/extension/lite/execution/ext/view/treetask.lite.html.hook.php new file mode 100644 index 0000000000..89812e9f87 --- /dev/null +++ b/extension/lite/execution/ext/view/treetask.lite.html.hook.php @@ -0,0 +1,3 @@ + diff --git a/extension/lite/story/ext/view/view.html.php b/extension/lite/story/ext/view/view.html.php index d01e99d581..ee9dac95c9 100644 --- a/extension/lite/story/ext/view/view.html.php +++ b/extension/lite/story/ext/view/view.html.php @@ -153,12 +153,10 @@ common::printIcon('story', 'assignTo', "storyID=$story->id", $story, 'button', '', '', 'iframe showinonlybody', true); common::printIcon('story', 'close', "storyID=$story->id", $story, 'button', '', '', 'iframe showinonlybody', true); common::printIcon('story', 'activate', "storyID=$story->id", $story, 'button', '', '', 'iframe showinonlybody', true); - if(isset($this->config->maxVersion) and $this->app->tab == 'project' and common::hasPriv('story', 'importToLib')) echo html::a('#importToLib', " " . $this->lang->story->importToLib, '', 'class="btn" data-toggle="modal"'); + if($this->config->edition == 'max' and $this->app->tab == 'project' and common::hasPriv('story', 'importToLib')) echo html::a('#importToLib', " " . $this->lang->story->importToLib, '', 'class="btn" data-toggle="modal"'); if($from == 'execution' and strpos('draft,closed', $story->status) === false) common::printIcon('task', 'create', "execution=$param&storyID=$story->id&moduleID=$story->module", $story, 'button', 'plus', '', 'showinonlybody'); - echo $this->buildOperateMenu($story, 'view'); - echo "
"; common::printIcon('story', 'edit', "storyID=$story->id", $story); common::printIcon('story', 'create', "productID=$story->product&branch=$story->branch&moduleID=$story->module&storyID=$story->id&executionID=0&bugID=0&planID=0&todoID=0&extra=&type=$story->type", $story, 'button', 'copy', '', '', '', "data-width='1050'"); diff --git a/extension/lite/task/ext/view/batchcreate.html.php b/extension/lite/task/ext/view/batchcreate.html.php index 6f432d2625..b3f9af9942 100644 --- a/extension/lite/task/ext/view/batchcreate.html.php +++ b/extension/lite/task/ext/view/batchcreate.html.php @@ -55,7 +55,7 @@ } $colspan = count($visibleFields) + 3; ?> -
+