summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-04-21 13:41:56 +0200
committerRémy Coutable <remy@rymai.me>2016-04-21 13:53:18 +0200
commit7ad7d3d3b0737927797a6eb86480ab3e147ababe (patch)
treecfdb9fab17c722a2d3b28f1d418593870b9bf025
parentf385a5309cb90946571fe3cc08a2754906090e4a (diff)
downloadgitlab-ce-15457-fix-due-date-sort.tar.gz
Remove "sort by due date later" since it isn't really useful15457-fix-due-date-sort
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--app/helpers/sorting_helper.rb9
-rw-r--r--app/models/issue.rb2
-rw-r--r--app/views/shared/_sort_dropdown.html.haml2
-rw-r--r--spec/features/issues_spec.rb14
4 files changed, 0 insertions, 27 deletions
diff --git a/app/helpers/sorting_helper.rb b/app/helpers/sorting_helper.rb
index 630e10ea892..5e5ea389541 100644
--- a/app/helpers/sorting_helper.rb
+++ b/app/helpers/sorting_helper.rb
@@ -9,7 +9,6 @@ module SortingHelper
sort_value_milestone_soon => sort_title_milestone_soon,
sort_value_milestone_later => sort_title_milestone_later,
sort_value_due_date_soon => sort_title_due_date_soon,
- sort_value_due_date_later => sort_title_due_date_later,
sort_value_largest_repo => sort_title_largest_repo,
sort_value_recently_signin => sort_title_recently_signin,
sort_value_oldest_signin => sort_title_oldest_signin,
@@ -56,10 +55,6 @@ module SortingHelper
'Due soon'
end
- def sort_title_due_date_later
- 'Due later'
- end
-
def sort_title_name
'Name'
end
@@ -112,10 +107,6 @@ module SortingHelper
'due_date_asc'
end
- def sort_value_due_date_later
- 'due_date_desc'
- end
-
def sort_value_name
'name_asc'
end
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 22896979bd7..45b6dd9cbf2 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -51,7 +51,6 @@ class Issue < ActiveRecord::Base
scope :due_between, ->(from_date, to_date) { where('issues.due_date >= ?', from_date).where('issues.due_date <= ?', to_date) }
scope :order_due_date_asc, -> { reorder(due_date: :asc) }
- scope :order_due_date_desc, -> { reorder(due_date: :desc) }
state_machine :state, initial: :opened do
event :close do
@@ -99,7 +98,6 @@ class Issue < ActiveRecord::Base
def self.sort(method)
case method.to_s
when 'due_date_asc' then order_due_date_asc
- when 'due_date_desc' then order_due_date_desc
else
super
end
diff --git a/app/views/shared/_sort_dropdown.html.haml b/app/views/shared/_sort_dropdown.html.haml
index d327bd0a96f..aa77ca3a241 100644
--- a/app/views/shared/_sort_dropdown.html.haml
+++ b/app/views/shared/_sort_dropdown.html.haml
@@ -23,8 +23,6 @@
- if controller.controller_name == 'issues' || controller.action_name == 'issues'
= link_to page_filter_path(sort: sort_value_due_date_soon) do
= sort_title_due_date_soon
- = link_to page_filter_path(sort: sort_value_due_date_later) do
- = sort_title_due_date_later
= link_to page_filter_path(sort: sort_value_upvotes) do
= sort_title_upvotes
= link_to page_filter_path(sort: sort_value_downvotes) do
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index 5fa8caaa935..64848acf83a 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -164,20 +164,6 @@ describe 'Issues', feature: true do
expect(first_issue).to include('foo')
end
-
- it 'sorts by least recently due date' do
- visit namespace_project_issues_path(project.namespace, project, sort: sort_value_due_date_later)
-
- expect(first_issue).to include('bar')
- end
-
- it 'sorts by least recently due date by excluding nil due dates' do
- bar.update(due_date: nil)
-
- visit namespace_project_issues_path(project.namespace, project, sort: sort_value_due_date_later)
-
- expect(first_issue).to include('foo')
- end
end
describe 'filtering by due date' do