Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMehmet Beydogan <mehmet.beydogan@gmail.com>2016-03-18 20:17:01 +0300
committerRobert Speicher <rspeicher@gmail.com>2016-04-20 22:42:09 +0300
commit61a306aa58f7fffd652a31b85719b19d08f0fd7f (patch)
treed937ae097121109cc05070bde406ae7dc18416aa /app/helpers/issues_helper.rb
parent83bda94ffcfe1944ea255fdbb8dfd9dac5b97d9f (diff)
Fix functionality of due this week. Add due this month and overdue, remove due tomorrow to issues.
Fix typos on sorting dropdown related to due date Remove constant array and add Structs on Issue to keep due date data to fill options
Diffstat (limited to 'app/helpers/issues_helper.rb')
-rw-r--r--app/helpers/issues_helper.rb12
1 files changed, 7 insertions, 5 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 2a193e12ec9..d3779eda91f 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -174,12 +174,14 @@ module IssuesHelper
def due_date_options
options = [
- ["Due to tomorrow", 1.day.from_now.to_date],
- ["Due in this week", 1.week.from_now.to_date]
+ Issue::AnyDueDate,
+ Issue::NoDueDate,
+ Issue::DueThisWeek,
+ Issue::DueThisMonth,
+ Issue::OverDue
]
- options.unshift(Issue::ANY_DUE_DATE)
- options.unshift(Issue::NO_DUE_DATE)
- options_for_select(options, params[:due_date])
+
+ options_from_collection_for_select(options, 'name', 'title', params[:due_date])
end