diff options
author | Phil Hughes <me@iamphill.com> | 2016-03-16 08:48:27 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-03-16 08:48:27 +0000 |
commit | 438d614b2780e280256af81f1e3f2f1847b3405e (patch) | |
tree | 02c0c002a4444136533ca96576425d1457a33d2b /app/helpers/issuables_helper.rb | |
parent | 2e07ee7f01e9bd525c98ae3f84025dd8699fdf8a (diff) | |
download | gitlab-ce-438d614b2780e280256af81f1e3f2f1847b3405e.tar.gz |
Removed label/milestone helper methodsdropdown-preselect-value
Diffstat (limited to 'app/helpers/issuables_helper.rb')
-rw-r--r-- | app/helpers/issuables_helper.rb | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index b254c62da26..23f389b8c5f 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -23,8 +23,14 @@ module IssuablesHelper def user_dropdown_label(user_id, default_label) return "Unassigned" if user_id == "0" - user = @project.team.users.find_by(id: user_id) if @project - user = User.find_by_id(user_id) if !@project + if @project + member = @project.team.find_member(user_id) + if member + user = member.user + end + else + user = User.find(user_id) + end if user user.name @@ -33,22 +39,6 @@ module IssuablesHelper end end - def labels_dropdown_label(label_name) - if !label_name - "Label" - else - label_name - end - end - - def milestone_dropdown_label(milestone_name) - if !milestone_name - "Milestone" - else - milestone_name - end - end - private def sidebar_gutter_collapsed? |