Commit fcb39162 authored by jplang's avatar jplang

Fixed that spent time on my page does not include entries without issue (#19320).

git-svn-id: https://svn.redmine.org/redmine/trunk@14071 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 0802ddcd
......@@ -68,7 +68,9 @@ module MyHelper
def timelog_items
TimeEntry.
where("#{TimeEntry.table_name}.user_id = ? AND #{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", User.current.id, Date.today - 6, Date.today).
joins(:activity, :project, {:issue => [:tracker, :status]}).
joins(:activity, :project).
references(:issue => [:tracker, :status]).
includes(:issue => [:tracker, :status]).
order("#{TimeEntry.table_name}.spent_on DESC, #{Project.table_name}.name ASC, #{Tracker.table_name}.position ASC, #{Issue.table_name}.id ASC").
to_a
end
......
# Redmine - project management software
# Copyright (C) 2006-2015 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 MyHelperTest < ActionView::TestCase
include Redmine::I18n
include ERB::Util
include MyHelper
fixtures :projects, :trackers, :issue_statuses, :issues,
:enumerations, :users, :issue_categories,
:projects_trackers,
:roles,
:member_roles,
:members,
:enabled_modules,
:versions
def test_timelog_items_should_include_time_entries_without_issue
User.current = User.find(2)
entry = TimeEntry.generate!(:spent_on => Date.today, :user_id => 2, :project_id => 1)
assert_nil entry.issue
assert_include entry, timelog_items
end
def test_timelog_items_should_include_time_entries_with_issue
User.current = User.find(2)
entry = TimeEntry.generate!(:spent_on => Date.today, :user_id => 2, :project_id => 1, :issue_id => 1)
assert_not_nil entry.issue
assert_include entry, timelog_items
end
end
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