jro_apps/redmine Commit - r13825:873dff0d364e

Merged r14165 and r14166 (#19544)....

Jean-Philippe Lang -

r13825:873dff0d364e

parent child

Context file:

r13825:873dff0d364e

app/helpers/sort_helper.rb +9 -4

                   sql = @criteria.collect do |k,o|
                     if s = @available_criteria[k]
                       s = [s] unless s.is_a?(Array)
-                      (o ? s : s.collect {|c| append_desc(c)})
+                      s.collect {|c| append_order(c, o ? "ASC" : "DESC")}
                     end
                   end.flatten.compact
                   sql.blank? ? nil : sql
                   self
                 end
-                # Appends DESC to the sort criterion unless it has a fixed order
+                # Appends ASC/DESC to the sort criterion unless it has a fixed order
-                def append_desc(criterion)
+                def append_order(criterion, order)
                   if criterion =~ / (asc|desc)$/i
                     criterion
                   else
-                    "#{criterion} DESC"
+                    "#{criterion} #{order}"
                   end
                 end
+                # Appends DESC to the sort criterion unless it has a fixed order
+                def append_desc(criterion)
+                  append_order(criterion, "DESC")
+                end
               end
               def sort_name

test/functional/issues_controller_test.rb +8 0

                 assert_not_nil assigns(:issue_count_by_group)
               end
+              def test_index_with_query_grouped_and_sorted_by_category
+                get :index, :project_id => 1, :set_filter => 1, :group_by => "category", :sort => "category"
+                assert_response :success
+                assert_template 'index'
+                assert_not_nil assigns(:issues)
+                assert_not_nil assigns(:issue_count_by_group)
+              end
               def test_index_with_query_grouped_by_list_custom_field
                 get :index, :project_id => 1, :query_id => 9
                 assert_response :success

test/unit/helpers/sort_helper_test.rb +2 -2

                 sort_init 'attr1', 'desc'
                 sort_update({'attr1' => 'table1.attr1', 'attr2' => 'table2.attr2'})
-                assert_equal ['table1.attr1', 'table2.attr2 DESC'], sort_clause
+                assert_equal ['table1.attr1 ASC', 'table2.attr2 DESC'], sort_clause
                 assert_equal 'attr1,attr2:desc', @session['foo_bar_sort']
               end
                 sort_init 'attr1', 'desc'
                 sort_update({'attr1' => 'table1.attr1', 'attr2' => 'table2.attr2'})
-                assert_equal ['table1.attr1', 'table2.attr2'], sort_clause
+                assert_equal ['table1.attr1 ASC', 'table2.attr2 ASC'], sort_clause
                 assert_equal 'attr1,attr2', @session['foo_bar_sort']
               end

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages