From c295f67329655587a19c96fa479bc04828fdcb1c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 21 Dec 2013 11:23:58 +0000
Subject: [PATCH] Merged r12414 (#15623).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12431 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/timelog_controller.rb |  2 +-
 app/models/time_entry_query.rb        | 15 +++++++++-
 test/unit/time_entry_query_test.rb    | 40 +++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 test/unit/time_entry_query_test.rb

diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index 1a880a133..a8f4d53a6 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -47,7 +47,7 @@ class TimelogController < ApplicationController
     sort_init(@query.sort_criteria.empty? ? [['spent_on', 'desc']] : @query.sort_criteria)
     sort_update(@query.sortable_columns)
     scope = time_entry_scope(:order => sort_clause).
-      includes(:project, :activity, :user, :issue).
+      includes(:project, :user, :issue).
       preload(:issue => [:project, :tracker, :status, :assigned_to, :priority])
 
     respond_to do |format|
diff --git a/app/models/time_entry_query.rb b/app/models/time_entry_query.rb
index 3325b55a8..02bc10090 100644
--- a/app/models/time_entry_query.rb
+++ b/app/models/time_entry_query.rb
@@ -106,7 +106,20 @@ class TimeEntryQuery < Query
     TimeEntry.visible.
       where(statement).
       order(order_option).
-      joins(joins_for_order_statement(order_option.join(',')))
+      joins(joins_for_order_statement(order_option.join(','))).
+      includes(:activity)
+  end
+
+  def sql_for_activity_id_field(field, operator, value)
+    condition_on_id = sql_for_field(field, operator, value, Enumeration.table_name, 'id')
+    condition_on_parent_id = sql_for_field(field, operator, value, Enumeration.table_name, 'parent_id')
+    ids = value.map(&:to_i).join(',')
+    table_name = Enumeration.table_name
+    if operator == '='
+      "(#{table_name}.id IN (#{ids}) OR #{table_name}.parent_id IN (#{ids}))"
+    else
+      "(#{table_name}.id NOT IN (#{ids}) AND (#{table_name}.parent_id IS NULL OR #{table_name}.parent_id NOT IN (#{ids})))"
+    end
   end
 
   # Accepts :from/:to params as shortcut filters
diff --git a/test/unit/time_entry_query_test.rb b/test/unit/time_entry_query_test.rb
new file mode 100644
index 000000000..203c6cc5b
--- /dev/null
+++ b/test/unit/time_entry_query_test.rb
@@ -0,0 +1,40 @@
+# Redmine - project management software
+# Copyright (C) 2006-2013  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+require File.expand_path('../../test_helper', __FILE__)
+
+class TimeEntryQueryTest < ActiveSupport::TestCase
+  fixtures :projects, :users, :enumerations
+
+  def test_activity_filter_should_consider_system_and_project_activities
+    TimeEntry.delete_all
+    system = TimeEntryActivity.create!(:name => 'Foo')
+    override = TimeEntryActivity.create!(:name => 'Foo', :parent_id => system.id, :project_id => 1)
+    other = TimeEntryActivity.create!(:name => 'Bar')
+    TimeEntry.generate!(:activity => system, :hours => 1.0)
+    TimeEntry.generate!(:activity => override, :hours => 2.0)
+    TimeEntry.generate!(:activity => other, :hours => 4.0)
+
+    query = TimeEntryQuery.new(:name => '_')
+    query.add_filter('activity_id', '=', [system.id.to_s])
+    assert_equal 3.0, query.results_scope.sum(:hours)
+
+    query = TimeEntryQuery.new(:name => '_')
+    query.add_filter('activity_id', '!', [system.id.to_s])
+    assert_equal 4.0, query.results_scope.sum(:hours)
+  end
+end
-- 
2.39.5