diff options
| author | Guilherme Salazar <gmesalazar@gmail.com> | 2016-09-26 18:36:11 -0300 |
|---|---|---|
| committer | Guilherme Salazar <gmesalazar@gmail.com> | 2016-10-28 14:01:36 -0200 |
| commit | 32913b74b836c7b689e681a030de00da0552954a (patch) | |
| tree | 3e13e52f35e8236049c8413e695a47bae8f3a671 /app/helpers | |
| parent | 4fd015183cdb280083384c69261c2ab5d475a54b (diff) | |
| download | gitlab-ce-32913b74b836c7b689e681a030de00da0552954a.tar.gz | |
add "x of y tasks completed" on issuable
fix issues pointed out in !6527
add task completion status feature to CHANGELOG
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/issuables_helper.rb | 8 |
1 files changed, 8 insertions, 0 deletions
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) |