From 32913b74b836c7b689e681a030de00da0552954a Mon Sep 17 00:00:00 2001 From: Guilherme Salazar Date: Mon, 26 Sep 2016 18:36:11 -0300 Subject: add "x of y tasks completed" on issuable fix issues pointed out in !6527 add task completion status feature to CHANGELOG --- app/helpers/issuables_helper.rb | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'app/helpers/issuables_helper.rb') diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index 03b2db1bc91..ef6cfb235a9 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -71,6 +71,14 @@ module IssuablesHelper author_output = link_to_member(project, issuable.author, size: 24, mobile_classes: "hidden-xs", tooltip: true) author_output << link_to_member(project, issuable.author, size: 24, by_username: true, avatar: false, mobile_classes: "hidden-sm hidden-md hidden-lg") end + + if issuable.tasks? + output << " ".html_safe + output << content_tag(:span, issuable.task_status, id: "task_status", class: "hidden-xs") + output << content_tag(:span, issuable.task_status_short, id: "task_status_short", class: "hidden-sm hidden-md hidden-lg") + end + + output end def issuable_todo(issuable) -- cgit v1.2.1