jro_apps/redmine Commit - r13689:6e356071dd3b

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

Jean-Philippe Lang -

r13689:6e356071dd3b

parent child

Context file:

r13689:6e356071dd3b

Collapse all files

test/unit/helpers/my_helper_test.rb created 644 +50 0

@@ -0,0 +1,50
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2015 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.expand_path('../../../test_helper', __FILE__)
	19
	20	class MyHelperTest < ActionView::TestCase
	21	include Redmine::I18n
	22	include ERB::Util
	23	include MyHelper
	24
	25
	26	fixtures :projects, :trackers, :issue_statuses, :issues,
	27	:enumerations, :users, :issue_categories,
	28	:projects_trackers,
	29	:roles,
	30	:member_roles,
	31	:members,
	32	:enabled_modules,
	33	:versions
	34
	35	def test_timelog_items_should_include_time_entries_without_issue
	36	User.current = User.find(2)
	37	entry = TimeEntry.generate!(:spent_on => Date.today, :user_id => 2, :project_id => 1)
	38	assert_nil entry.issue
	39
	40	assert_include entry, timelog_items
	41	end
	42
	43	def test_timelog_items_should_include_time_entries_with_issue
	44	User.current = User.find(2)
	45	entry = TimeEntry.generate!(:spent_on => Date.today, :user_id => 2, :project_id => 1, :issue_id => 1)
	46	assert_not_nil entry.issue
	47
	48	assert_include entry, timelog_items
	49	end
	50	end

app/helpers/my_helper.rb +3 -1

             # encoding: utf-8
             #
             # 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.
             module MyHelper
               def calendar_items(startdt, enddt)
                 Issue.visible.
                   where(:project_id => User.current.projects.map(&:id)).
                   where("(start_date>=? and start_date<=?) or (due_date>=? and due_date<=?)", startdt, enddt, startdt, enddt).
                   includes(:project, :tracker, :priority, :assigned_to).
                   references(:project, :tracker, :priority, :assigned_to).
                   to_a
               end
               def documents_items
                 Document.visible.order("#{Document.table_name}.created_on DESC").limit(10).to_a
               end
               def issuesassignedtome_items
                 Issue.visible.open.
                   where(:assigned_to_id => ([User.current.id] + User.current.group_ids)).
                   limit(10).
                   includes(:status, :project, :tracker, :priority).
                   references(:status, :project, :tracker, :priority).
                   order("#{IssuePriority.table_name}.position DESC, #{Issue.table_name}.updated_on DESC").
                   to_a
               end
               def issuesreportedbyme_items
                 Issue.visible.
                   where(:author_id => User.current.id).
                   limit(10).
                   includes(:status, :project, :tracker).
                   references(:status, :project, :tracker).
                   order("#{Issue.table_name}.updated_on DESC").
                   to_a
               end
               def issueswatched_items
                 Issue.visible.on_active_project.watched_by(User.current.id).recently_updated.limit(10).to_a
               end
               def news_items
                 News.visible.
                   where(:project_id => User.current.projects.map(&:id)).
                   limit(10).
                   includes(:project, :author).
                   references(:project, :author).
                   order("#{News.table_name}.created_on DESC").
                   to_a
               end
               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
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages