From 62699ca48d376d7d7950b852d59b13ca4a12e127 Mon Sep 17 00:00:00 2001 From: zhengrunyu Date: Mon, 28 Feb 2022 15:51:59 +0800 Subject: [PATCH] * Finish task 49294 . --- module/execution/view/story.html.php | 2 +- module/my/view/requirement.html.php | 2 +- module/my/view/story.html.php | 2 +- module/story/model.php | 2 +- module/story/view/view.html.php | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php index 8a7c66e1d0..d95e2bffaa 100644 --- a/module/execution/view/story.html.php +++ b/module/execution/view/story.html.php @@ -284,7 +284,7 @@ if(common::hasPriv('story', 'recall')) { $recallDisabled = empty($story->reviewedBy) and strpos('draft,changed', $story->status) !== false and !empty($story->reviewer) ? '' : 'disabled'; - common::printIcon('story', 'recall', "story={$story->id}", $story, 'list', 'back', 'hiddenwin', $recallDisabled, '', '', $lang->story->recall); + common::printIcon('story', 'recall', "story={$story->id}", $story, 'list', 'undo', 'hiddenwin', $recallDisabled, '', '', $lang->story->recall); } $lang->task->create = $lang->execution->wbs; diff --git a/module/my/view/requirement.html.php b/module/my/view/requirement.html.php index d2bf647b6b..0cbe9bc1eb 100644 --- a/module/my/view/requirement.html.php +++ b/module/my/view/requirement.html.php @@ -101,7 +101,7 @@ $vars = "story={$story->id}"; echo common::buildIconButton('story', 'change', $vars, $story, 'list', 'alter', '', 'iframe', true); echo common::buildIconButton('story', 'review', $vars, $story, 'list', 'search', '', 'iframe', true); - echo common::buildIconButton('story', 'recall', $vars, $story, 'list', 'back', 'hiddenwin', '', '', '', $lang->story->recall); + echo common::buildIconButton('story', 'recall', $vars, $story, 'list', 'undo', 'hiddenwin', '', '', '', $lang->story->recall); echo common::buildIconButton('story', 'close', $vars, $story, 'list', '', '', 'iframe', true); echo common::buildIconButton('story', 'edit', $vars, $story, 'list', '', '', 'iframe', true, "data-width='95%'"); } diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php index d410598f76..04fdcef3c8 100644 --- a/module/my/view/story.html.php +++ b/module/my/view/story.html.php @@ -103,7 +103,7 @@ $vars = "story={$story->id}"; echo common::buildIconButton('story', 'change', $vars, $story, 'list', 'alter', '', 'iframe', true); echo common::buildIconButton('story', 'review', $vars, $story, 'list', 'search', '', 'iframe', true); - echo common::buildIconButton('story', 'recall', $vars, $story, 'list', 'back', 'hiddenwin', '', '', '', $lang->story->recall); + echo common::buildIconButton('story', 'recall', $vars, $story, 'list', 'undo', 'hiddenwin', '', '', '', $lang->story->recall); echo common::buildIconButton('story', 'close', $vars, $story, 'list', '', '', 'iframe', true); echo common::buildIconButton('story', 'edit', $vars, $story, 'list', '', '', 'iframe', true, "data-width='95%'"); echo common::buildIconButton('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=¶m=0&$vars", $story, 'list', 'sitemap', '', 'iframe', true, "data-width='95%'"); diff --git a/module/story/model.php b/module/story/model.php index 9b1c15f6f9..56ad981af1 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -3985,7 +3985,7 @@ class storyModel extends model common::printIcon('story', 'change', $vars . "&from=$story->from", $story, 'list', 'alter', '', '', false, "data-group=$story->from"); common::printIcon('story', 'review', $vars . "&from=$story->from", $story, 'list', 'search', '', '', false, "data-group=$story->from"); - common::printIcon('story', 'recall', $vars, $story, 'list', 'back', 'hiddenwin', '', '', '', $this->lang->story->recall); + common::printIcon('story', 'recall', $vars, $story, 'list', 'undo', 'hiddenwin', '', '', '', $this->lang->story->recall); common::printIcon('story', 'close', $vars, $story, 'list', '', '', 'iframe', true); common::printIcon('story', 'edit', $vars . "&from=$story->from", $story, 'list', '', '', '', false, "data-group=$story->from"); if($story->type != 'requirement' and $this->config->vision != 'lite') common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=¶m=0&$vars", $story, 'list', 'sitemap', '', '', false, "data-app='qa'"); diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index 5ceae8236b..ab0cdd413f 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -203,6 +203,7 @@ deleted):?> id", $story, 'button', 'alter', '', 'showinonlybody'); + common::printIcon('story', 'recall', "storyID=$story->id", $story, 'button', 'undo', '', 'showinonlybody'); common::printIcon('story', 'review', "storyID=$story->id", $story, 'button', 'search', '', 'showinonlybody'); if($story->status == 'active' and $story->stage == 'wait' and $story->parent <= 0 and !isonlybody()) {