GitLab ist jetzt auf dem neuesten Stand! Die jüngsten Probleme wurden behoben. Wir entschuldigen uns für die dadurch verursachten Unannehmlichkeiten.

Commit 95710144 authored by jplang's avatar jplang

Error displaying time entries filtered by Activity (#26387).

git-svn-id: https://svn.redmine.org/redmine/trunk@16808 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent d00ef8ba
......@@ -115,6 +115,8 @@ class TimeEntryQuery < Query
def base_scope
TimeEntry.visible.
joins(:project, :user).
includes(:activity).
references(:activity).
left_join_issue.
where(statement)
end
......@@ -124,9 +126,7 @@ class TimeEntryQuery < Query
base_scope.
order(order_option).
joins(joins_for_order_statement(order_option.join(','))).
includes(:activity).
references(:activity)
joins(joins_for_order_statement(order_option.join(',')))
end
# Returns sum of all the spent hours
......
......@@ -847,6 +847,20 @@ class TimelogControllerTest < Redmine::ControllerTest
assert_equal [t3, t1, t2].map(&:id).map(&:to_s), css_select('input[name="ids[]"]').map {|e| e.attr('value')}
end
def test_index_with_activity_filter
activity = TimeEntryActivity.create!(:name => 'Activity')
entry = TimeEntry.generate!(:issue_id => 1, :hours => 4.5, :activity => activity)
get :index, :params => {
:f => ['activity_id'],
:op => {'activity_id' => '='},
:v => {'activity_id' => [activity.id.to_s]}
}
assert_response :success
assert_select "tr#time-entry-#{entry.id}"
assert_select "table.time-entries tbody tr", 1
end
def test_index_with_issue_status_filter
Issue.where(:status_id => 4).update_all(:status_id => 2)
issue = Issue.generate!(:project_id => 1, :tracker_id => 1, :status_id => 4)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment