jro_apps/redmine Commit - r11813:493119e795f0

Merged r12042 from trunk (#14366)....

Jean-Philippe Lang -

r11813:493119e795f0

parent child

Context file:

r11813:493119e795f0

Collapse all files

app/controllers/timelog_controller.rb +5 -9

               def index
                 @query = TimeEntryQuery.build_from_params(params, :project => @project, :name => '_')
-                scope = time_entry_scope
                 sort_init(@query.sort_criteria.empty? ? [['spent_on', 'desc']] : @query.sort_criteria)
                 sort_update(@query.sortable_columns)
+                scope = time_entry_scope(:order => sort_clause)
                 respond_to do |format|
                   format.html {
                     @entry_pages = Paginator.new @entry_count, per_page_option, params['page']
                     @entries = scope.all(
                       :include => [:project, :activity, :user, {:issue => :tracker}],
-                      :order => sort_clause,
                       :limit  =>  @entry_pages.per_page,
                       :offset =>  @entry_pages.offset
                     )
                     @offset, @limit = api_offset_and_limit
                     @entries = scope.all(
                       :include => [:project, :activity, :user, {:issue => :tracker}],
-                      :order => sort_clause,
                       :limit  => @limit,
                       :offset => @offset
                     )
                   }
                   format.atom {
-                    entries = scope.all(
+                    entries = scope.reorder("#{TimeEntry.table_name}.created_on DESC").all(
                       :include => [:project, :activity, :user, {:issue => :tracker}],
-                      :order => "#{TimeEntry.table_name}.created_on DESC",
                       :limit => Setting.feeds_limit.to_i
                     )
                     render_feed(entries, :title => l(:label_spent_time))
                   format.csv {
                     # Export all entries
                     @entries = scope.all(
-                      :include => [:project, :activity, :user, {:issue => [:tracker, :assigned_to, :priority]}],
+                      :include => [:project, :activity, :user, {:issue => [:tracker, :assigned_to, :priority]}]
-                      :order => sort_clause
                     )
                     send_data(query_to_csv(@entries, @query, params), :type => 'text/csv; header=present', :filename => 'timelog.csv')
                   }
               end
               # Returns the TimeEntry scope for index and report actions
-              def time_entry_scope
+              def time_entry_scope(options={})
-                scope = TimeEntry.visible.where(@query.statement)
+                scope = @query.results_scope(options)
                 if @issue
                   scope = scope.on_issue(@issue)
                 elsif @project

app/models/time_entry_query.rb +9 0

@@ -100,6 +100,15 class TimeEntryQuery < Query
100	@default_columns_names \|\|= [:project, :spent_on, :user, :activity, :issue, :comments, :hours]	100	@default_columns_names \|\|= [:project, :spent_on, :user, :activity, :issue, :comments, :hours]
101	end	101	end
102		102
		103	def results_scope(options={})
		104	order_option = [group_by_sort_order, options[:order]].flatten.reject(&:blank?)
		105
		106	TimeEntry.visible.
		107	where(statement).
		108	order(order_option).
		109	joins(joins_for_order_statement(order_option.join(',')))
		110	end
		111
103	# Accepts :from/:to params as shortcut filters	112	# Accepts :from/:to params as shortcut filters
104	def build_from_params(params)	113	def build_from_params(params)
105	super	114	super

test/functional/timelog_controller_test.rb +18 0

@@ -540,6 +540,24 class TimelogControllerTest < ActionController::TestCase
540	assert_select 'td.issue_cf_2', :text => 'filter_on_issue_custom_field'	540	assert_select 'td.issue_cf_2', :text => 'filter_on_issue_custom_field'
541	end	541	end
542		542
		543	def test_index_with_time_entry_custom_field_sorting
		544	field = TimeEntryCustomField.generate!(:field_format => 'string', :name => 'String Field')
		545	TimeEntry.generate!(:hours => 2.5, :custom_field_values => {field.id => 'CF Value 1'})
		546	TimeEntry.generate!(:hours => 2.5, :custom_field_values => {field.id => 'CF Value 3'})
		547	TimeEntry.generate!(:hours => 2.5, :custom_field_values => {field.id => 'CF Value 2'})
		548	field_name = "cf_#{field.id}"
		549
		550	get :index, :c => ["hours", field_name], :sort => field_name
		551	assert_response :success
		552	assert_include field_name.to_sym, assigns(:query).column_names
		553	assert_select "th a.sort", :text => 'String Field'
		554
		555	# Make sure that values are properly sorted
		556	values = assigns(:entries).map {\|e\| e.custom_field_value(field)}.compact
		557	assert_equal 3, values.size
		558	assert_equal values.sort, values
		559	end
		560
543	def test_index_atom_feed	561	def test_index_atom_feed
544	get :index, :project_id => 1, :format => 'atom'	562	get :index, :project_id => 1, :format => 'atom'
545	assert_response :success	563	assert_response :success

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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