jro_apps/redmine Commit - r10543:9f148e098b07

Ability to sort issues by grouped column (#3511)....

Jean-Philippe Lang -

r10543:9f148e098b07

parent child

Context file:

r10543:9f148e098b07

app/controllers/issues_controller.rb +1 0

                 retrieve_query
                 sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
                 sort_update(@query.sortable_columns)
+                @query.sort_criteria = sort_criteria.to_a
                 if @query.valid?
                   case params[:format]

app/helpers/sort_helper.rb +8 0

                   sql.blank? ? nil : sql
                 end
+                def to_a
+                  @criteria.dup
+                end
                 def add!(key, asc)
                   @criteria.delete_if {|k,o| k == key}
                   @criteria = [[key, asc]] + @criteria
                 @sort_criteria.to_sql
               end
+              def sort_criteria
+                @sort_criteria
+              end
               # Returns a link which sorts by the named column.
               #
               # - column is the name of an attribute in the sorted record collection.

app/models/query.rb +8 -3

                 if arg.is_a?(Hash)
                   arg = arg.keys.sort.collect {|k| arg[k]}
                 end
-                c = arg.select {|k,o| !k.to_s.blank?}.slice(0,3).collect {|k,o| [k.to_s, o == 'desc' ? o : 'asc']}
+                c = arg.select {|k,o| !k.to_s.blank?}.slice(0,3).collect {|k,o| [k.to_s, (o == 'desc' || o == false) ? 'desc' : 'asc']}
                 write_attribute(:sort_criteria, c)
               end
                 sort_criteria && sort_criteria[arg] && sort_criteria[arg].last
               end
+              def sort_criteria_order_for(key)
+                sort_criteria.detect {|k, order| key.to_s == k}.try(:last)
+              end
               # Returns the SQL sort order that should be prepended for grouping
               def group_by_sort_order
                 if grouped? && (column = group_by_column)
+                  order = sort_criteria_order_for(column.name) || column.default_order
                   column.sortable.is_a?(Array) ?
-                    column.sortable.collect {|s| "#{s} #{column.default_order}"}.join(',') :
+                    column.sortable.collect {|s| "#{s} #{order}"}.join(',') :
-                    "#{column.sortable} #{column.default_order}"
+                    "#{column.sortable} #{order}"
                 end
               end

test/functional/issues_controller_test.rb +20 0

@@ -297,6 +297,26 class IssuesControllerTest < ActionController::TestCase
297	end	297	end
298	end	298	end
299		299
		300	def test_index_with_query_grouped_by_tracker
		301	3.times {\|i\| Issue.generate!(:tracker_id => (i + 1))}
		302
		303	get :index, :set_filter => 1, :group_by => 'tracker', :sort => 'id:desc'
		304	assert_response :success
		305
		306	trackers = assigns(:issues).map(&:tracker).uniq
		307	assert_equal [1, 2, 3], trackers.map(&:id)
		308	end
		309
		310	def test_index_with_query_grouped_by_tracker_in_reverse_order
		311	3.times {\|i\| Issue.generate!(:tracker_id => (i + 1))}
		312
		313	get :index, :set_filter => 1, :group_by => 'tracker', :sort => 'id:desc,tracker:desc'
		314	assert_response :success
		315
		316	trackers = assigns(:issues).map(&:tracker).uniq
		317	assert_equal [3, 2, 1], trackers.map(&:id)
		318	end
		319
300	def test_index_with_query_id_and_project_id_should_set_session_query	320	def test_index_with_query_id_and_project_id_should_set_session_query
301	get :index, :project_id => 1, :query_id => 4	321	get :index, :project_id => 1, :query_id => 4
302	assert_response :success	322	assert_response :success

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