From 88024b17c03f5cc834465574c55a566f8f1a5819 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Thu, 24 Mar 2016 15:20:35 +0000 Subject: Standardised the output of the JSON to always include the name The frontend will then always use the name as the ID - like previous --- app/helpers/issuables_helper.rb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'app/helpers') diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index 62050691a39..53e53977da2 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -47,6 +47,20 @@ module IssuablesHelper end end + def milestone_dropdown_label(milestone_title, default_label) + milestone_title = if milestone_title == Milestone::Upcoming.name + Milestone::Upcoming.title + else + milestone_title + end + + if !milestone_title.nil? && !milestone_title.empty? + h(milestone_title) + else + default_label + end + end + private def sidebar_gutter_collapsed? -- cgit v1.2.1 From f8b5ff95202dec5011d92427d9acbe858b59b57d Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Thu, 24 Mar 2016 16:14:48 +0000 Subject: Fixed rubocop issues --- app/helpers/issuables_helper.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'app/helpers') diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index 53e53977da2..462bfdb81c0 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -48,11 +48,12 @@ module IssuablesHelper end def milestone_dropdown_label(milestone_title, default_label) - milestone_title = if milestone_title == Milestone::Upcoming.name - Milestone::Upcoming.title - else - milestone_title - end + milestone_title = + if milestone_title == Milestone::Upcoming.name + Milestone::Upcoming.title + else + milestone_title + end if !milestone_title.nil? && !milestone_title.empty? h(milestone_title) -- cgit v1.2.1 From b5ece0886a421247ed572e19ac3ccbcb685883b8 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Tue, 29 Mar 2016 12:19:09 +0100 Subject: Ruby fixes --- app/helpers/issuables_helper.rb | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'app/helpers') diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index 462bfdb81c0..3709d04e8a2 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -48,18 +48,11 @@ module IssuablesHelper end def milestone_dropdown_label(milestone_title, default_label) - milestone_title = - if milestone_title == Milestone::Upcoming.name - Milestone::Upcoming.title - else - milestone_title - end - - if !milestone_title.nil? && !milestone_title.empty? - h(milestone_title) - else - default_label + if milestone_title == Milestone::Upcoming.name + milestone_title = Milestone::Upcoming.title end + + h(milestone_title.presence || default_label) end private -- cgit v1.2.1 From 31fea92295302d93973f0836eb4d040550b2deda Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Tue, 29 Mar 2016 15:26:12 +0100 Subject: Updated based on Ruby feedback --- app/helpers/issuables_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/helpers') diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index 3709d04e8a2..b14b8218d02 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -47,7 +47,7 @@ module IssuablesHelper end end - def milestone_dropdown_label(milestone_title, default_label) + def milestone_dropdown_label(milestone_title, default_label = "Milestone") if milestone_title == Milestone::Upcoming.name milestone_title = Milestone::Upcoming.title end -- cgit v1.2.1