From 8d862f699f2da74ec23694c7a45fc507c8ce593d Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Fri, 12 Apr 2024 09:36:29 +0800 Subject: [PATCH] * Fix bug #47755. --- module/story/view/view.html.php | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index 5ac78033543..c1355d3620d 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -124,13 +124,21 @@ processStatus('story', $child);?> id&from=&storyType=$child->type", $child, 'list', 'alter'); - common::printIcon('story', 'review', "storyID=$child->id&from=product&storyType=$child->type", $child, 'list', 'search', '', 'iframe showinonlybody', true); - common::printIcon('story', 'assignTo', "storyID=$child->id&kanbanGroup=default&from=&storyType=$child->type", $child, 'list', '', '', 'iframe showinonlybody', true); - common::printIcon('story', 'close', "storyID=$child->id&from=&storyType=$child->type", $child, 'list', '', '', 'iframe showinonlybody', true); - common::printIcon('story', 'activate', "storyID=$child->id&storyType=$child->type", $child, 'list', '', '', 'iframe showinonlybody', true); - common::printIcon('story', 'edit', "storyID=$child->id&kanbanGroup=default&storyType=$child->type", $child, 'list'); - common::printIcon('testcase', 'create', "productID=$child->product&branch=$child->branch&module=0&from=¶m=0&story={$child->id}", $child, 'list', 'sitemap', '', 'iframe showinonlybody', true); + if(!empty($child->confirmeObject)) + { + $method = $child->confirmeObject['type'] == 'confirmedretract' ? 'confirmDemandRetract' : 'confirmDemandUnlink'; + common::printIcon('story', $method, "objectID=$child->id&object=story&extra={$child->confirmeObject['id']}", $child, 'list', 'search', '', 'iframe', true);; + } + else + { + common::printIcon('story', 'change', "storyID=$child->id&from=&storyType=$child->type", $child, 'list', 'alter'); + common::printIcon('story', 'review', "storyID=$child->id&from=product&storyType=$child->type", $child, 'list', 'search', '', 'iframe showinonlybody', true); + common::printIcon('story', 'assignTo', "storyID=$child->id&kanbanGroup=default&from=&storyType=$child->type", $child, 'list', '', '', 'iframe showinonlybody', true); + common::printIcon('story', 'close', "storyID=$child->id&from=&storyType=$child->type", $child, 'list', '', '', 'iframe showinonlybody', true); + common::printIcon('story', 'activate', "storyID=$child->id&storyType=$child->type", $child, 'list', '', '', 'iframe showinonlybody', true); + common::printIcon('story', 'edit', "storyID=$child->id&kanbanGroup=default&storyType=$child->type", $child, 'list'); + common::printIcon('testcase', 'create', "productID=$child->product&branch=$child->branch&module=0&from=¶m=0&story={$child->id}", $child, 'list', 'sitemap', '', 'iframe showinonlybody', true); + } ?>