summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugenia Grieff <egrieff@gitlab.com>2019-09-04 16:59:19 +0100
committerEugenia Grieff <egrieff@gitlab.com>2019-09-11 14:55:14 +0100
commit7593aed4e8099eee7239fe2eb1ae1699c6948ee5 (patch)
tree969e040ef490217c62ad015bccaf0d8db1c63bc5
parent3a5c93fb0372a0c3b6383cbfedd967a2bc87b25b (diff)
downloadgitlab-ce-7593aed4e8099eee7239fe2eb1ae1699c6948ee5.tar.gz
Refactor issues helper
-rw-r--r--app/helpers/issues_helper.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 3096ad950a8..a9d596c1f99 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -152,9 +152,9 @@ module IssuesHelper
def issue_closed_label(issue, current_user)
if issue.moved? && can?(current_user, :read_issue, issue.moved_to)
- closed_label_text(issue, 'moved')
+ closed_label_with_link(issue, 'moved')
elsif issue.duplicated? && can?(current_user, :read_issue, issue.duplicated_to)
- closed_label_text(issue, 'duplicated')
+ closed_label_with_link(issue, 'duplicated')
else
_("Closed")
end
@@ -162,8 +162,10 @@ module IssuesHelper
private
- def closed_label_text(issue, action)
+ def closed_label_with_link(issue, action)
related_issue = issue.try(:"#{action}_to")
+ return _("Closed") unless related_issue
+
link_start = "<a href=\"#{issue_path(related_issue)}\" class=\"text-white text-underline\">".html_safe
link_end = '</a>'.html_safe