Merged r12042 from trunk (#14366).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12043 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-28 10:00:35 +00:00
parent f1b6b4ef33
commit 493119e795
3 changed files with 32 additions and 9 deletions
@@ -100,6 +100,15 @@ class TimeEntryQuery < Query
    @default_columns_names ||= [:project, :spent_on, :user, :activity, :issue, :comments, :hours]
  end

+  def results_scope(options={})
+    order_option = [group_by_sort_order, options[:order]].flatten.reject(&:blank?)
+
+    TimeEntry.visible.
+      where(statement).
+      order(order_option).
+      joins(joins_for_order_statement(order_option.join(',')))
+  end
+
  # Accepts :from/:to params as shortcut filters
  def build_from_params(params)
    super