Bläddra i källkod

Add support for grouping by issue on timelog view (#32436).

Patch by Kouhei Sutou.

git-svn-id: http://svn.redmine.org/redmine/trunk@19063 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/4.1.0
Jean-Philippe Lang 4 år sedan
förälder
incheckning
4a447dda09
2 ändrade filer med 15 tillägg och 1 borttagningar
  1. 1
    1
      app/models/time_entry_query.rb
  2. 14
    0
      test/functional/timelog_controller_test.rb

+ 1
- 1
app/models/time_entry_query.rb Visa fil

@@ -30,7 +30,7 @@ class TimeEntryQuery < Query
QueryColumn.new(:author, :sortable => lambda {User.fields_for_order_statement}),
QueryColumn.new(:user, :sortable => lambda {User.fields_for_order_statement}, :groupable => true),
QueryColumn.new(:activity, :sortable => "#{TimeEntryActivity.table_name}.position", :groupable => true),
QueryColumn.new(:issue, :sortable => "#{Issue.table_name}.id"),
QueryColumn.new(:issue, :sortable => "#{Issue.table_name}.id", :groupable => true),
QueryAssociationColumn.new(:issue, :tracker, :caption => :field_tracker, :sortable => "#{Tracker.table_name}.position"),
QueryAssociationColumn.new(:issue, :status, :caption => :field_status, :sortable => "#{IssueStatus.table_name}.position"),
QueryAssociationColumn.new(:issue, :category, :caption => :field_category, :sortable => "#{IssueCategory.table_name}.name"),

+ 14
- 0
test/functional/timelog_controller_test.rb Visa fil

@@ -1418,4 +1418,18 @@ class TimelogControllerTest < Redmine::ControllerTest
assert_select '+ span.count', :text => '2'
end
end

def test_index_grouped_by_issue
get :index, :params => {
:set_filter => 1,
:group_by => 'issue'
}
assert_response :success

assert_select 'tr.group span.name' do |elements|
target_element = elements[1]
assert_equal "Bug #1: Cannot print recipes", target_element.text
assert_select target_element, '+ span.count', :text => '2'
end
end
end

Laddar…
Avbryt
Spara