jro_apps/redmine Commit - r5029:0786b9ef99b0

Replaces TimeEntry.visible_by with a visible scope....

Jean-Philippe Lang -

r5029:0786b9ef99b0

parent child

Context file:

r5029:0786b9ef99b0

Collapse all files

app/controllers/projects_controller.rb +4 -5

             # Redmine - project management software
-            # Copyright (C) 2006-2009  Jean-Philippe Lang
+            # Copyright (C) 2006-2011  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
                                                         :include => [:project, :status, :tracker],
                                                         :conditions => cond)
-                TimeEntry.visible_by(User.current) do
+                if User.current.allowed_to?(:view_time_entries, @project)
-                  @total_hours = TimeEntry.sum(:hours,
+                  @total_hours = TimeEntry.visible.sum(:hours, :include => :project, :conditions => cond).to_f
-                                               :include => :project,
-                                               :conditions => cond).to_f
                 end
                 @key = User.current.rss_key
                 respond_to do |format|

app/controllers/timelog_controller.rb +43 -47

@@ -40,60 +40,56 class TimelogController < ApplicationController
40	'hours' => 'hours'	40	'hours' => 'hours'
41		41
42	cond = ARCondition.new	42	cond = ARCondition.new
43	if @project.nil?	43	if @issue
44	cond << Project.allowed_to_condition(User.current, :view_time_entries)
45	elsif @issue.nil?
46	cond << @project.project_condition(Setting.display_subprojects_issues?)
47	else
48	cond << "#{Issue.table_name}.root_id = #{@issue.root_id} AND #{Issue.table_name}.lft >= #{@issue.lft} AND #{Issue.table_name}.rgt <= #{@issue.rgt}"	44	cond << "#{Issue.table_name}.root_id = #{@issue.root_id} AND #{Issue.table_name}.lft >= #{@issue.lft} AND #{Issue.table_name}.rgt <= #{@issue.rgt}"
		45	elsif @project
		46	cond << @project.project_condition(Setting.display_subprojects_issues?)
49	end	47	end
50		48
51	retrieve_date_range	49	retrieve_date_range
52	cond << ['spent_on BETWEEN ? AND ?', @from, @to]	50	cond << ['spent_on BETWEEN ? AND ?', @from, @to]
53		51
54	TimeEntry.visible_by(User.current) do	52	respond_to do \|format\|
55	respond_to do \|format\|	53	format.html {
56	format.html {	54	# Paginate results
57	# Paginate results	55	@entry_count = TimeEntry.visible.count(:include => [:project, :issue], :conditions => cond.conditions)
58	@entry_count = TimeEntry.count(:include => [:project, :issue], :conditions => cond.conditions)	56	@entry_pages = Paginator.new self, @entry_count, per_page_option, params['page']
59	@entry_pages = Paginator.new self, @entry_count, per_page_option, params['page']	57	@entries = TimeEntry.visible.find(:all,
60	@entries = TimeEntry.find(:all,	58	:include => [:project, :activity, :user, {:issue => :tracker}],
61	:include => [:project, :activity, :user, {:issue => :tracker}],	59	:conditions => cond.conditions,
62	~~:conditions~~ => ~~cond~~.~~conditions~~,	60	:order => sort_clause,
63	~~:order~~ => ~~sort_claus~~e,	61	:limit => @entry_pages.items_per_page,
64	~~:limit~~ => @entry_pages.~~items_per_page~~,	62	:offset => @entry_pages.current.offset)
65	:offset => @entry_pages.current.offset)	63	@total_hours = TimeEntry.visible.sum(:hours, :include => [:project, :issue], :conditions => cond.conditions).to_f
66	@total_hours = TimeEntry.sum(:hours, :include => [:project, :issue], :conditions => cond.conditions).to_f
67		64
68	render :layout => !request.xhr?	65	render :layout => !request.xhr?
69	}	66	}
70	format.api {	67	format.api {
71	@entry_count = TimeEntry.count(:include => [:project, :issue], :conditions => cond.conditions)	68	@entry_count = TimeEntry.visible.count(:include => [:project, :issue], :conditions => cond.conditions)
72	@entry_pages = Paginator.new self, @entry_count, per_page_option, params['page']	69	@entry_pages = Paginator.new self, @entry_count, per_page_option, params['page']
73	@entries = TimeEntry.find(:all,	70	@entries = TimeEntry.visible.find(:all,
74	:include => [:project, :activity, :user, {:issue => :tracker}],	71	:include => [:project, :activity, :user, {:issue => :tracker}],
75	:conditions => cond.conditions,	72	:conditions => cond.conditions,
76	:order => sort_clause,	73	:order => sort_clause,
77	:limit => @entry_pages.items_per_page,	74	:limit => @entry_pages.items_per_page,
78	:offset => @entry_pages.current.offset)	75	:offset => @entry_pages.current.offset)
79	}	76	}
80	format.atom {	77	format.atom {
81	entries = TimeEntry.find(:all,	78	entries = TimeEntry.visible.find(:all,
82	:include => [:project, :activity, :user, {:issue => :tracker}],	79	:include => [:project, :activity, :user, {:issue => :tracker}],
83	:conditions => cond.conditions,	80	:conditions => cond.conditions,
84	:order => "#{TimeEntry.table_name}.created_on DESC",	81	:order => "#{TimeEntry.table_name}.created_on DESC",
85	:limit => Setting.feeds_limit.to_i)	82	:limit => Setting.feeds_limit.to_i)
86	render_feed(entries, :title => l(:label_spent_time))	83	render_feed(entries, :title => l(:label_spent_time))
87	}	84	}
88	format.csv {	85	format.csv {
89	# Export all entries	86	# Export all entries
90	@entries = TimeEntry.find(:all,	87	@entries = TimeEntry.visible.find(:all,
91	:include => [:project, :activity, :user, {:issue => [:tracker, :assigned_to, :priority]}],	88	:include => [:project, :activity, :user, {:issue => [:tracker, :assigned_to, :priority]}],
92	:conditions => cond.conditions,	89	:conditions => cond.conditions,
93	:order => sort_clause)	90	:order => sort_clause)
94	send_data(entries_to_csv(@entries), :type => 'text/csv; header=present', :filename => 'timelog.csv')	91	send_data(entries_to_csv(@entries), :type => 'text/csv; header=present', :filename => 'timelog.csv')
95	}	92	}
96	end
97	end	93	end
98	end	94	end
99		95

app/models/time_entry.rb +9 -2

-            # redMine - project management software
+            # Redmine - project management software
-            # Copyright (C) 2006-2008  Jean-Philippe Lang
+            # Copyright (C) 2006-2011  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
               validates_presence_of :user_id, :activity_id, :project_id, :hours, :spent_on
               validates_numericality_of :hours, :allow_nil => true, :message => :invalid
               validates_length_of :comments, :maximum => 255, :allow_nil => true
+              named_scope :visible, lambda {|*args| {
+                :include => :project,
+                :conditions => Project.allowed_to_condition(args.first || User.current, :view_time_entries)
+              }}
               def after_initialize
                 if new_record? && self.activity.nil?
                 (usr == user && usr.allowed_to?(:edit_own_time_entries, project)) || usr.allowed_to?(:edit_time_entries, project)
               end
+              # TODO: remove this method in 1.3.0
               def self.visible_by(usr)
+                ActiveSupport::Deprecation.warn "TimeEntry.visible_by is deprecated and will be removed in Redmine 1.3.0. Use the visible scope instead."
                 with_scope(:find => { :conditions => Project.allowed_to_condition(usr, :view_time_entries) }) do
                   yield
                 end

app/views/projects/show.rhtml +1 -1

             </div>
             <% content_for :sidebar do %>
-                <% if @total_hours && User.current.allowed_to?(:view_time_entries, @project) %>
+                <% if @total_hours.present? %>
                 <h3><%= l(:label_spent_time) %></h3>
                 <p><span class="icon icon-time"><%= l_hours(@total_hours) %></span></p>
                 <p><%= link_to(l(:label_details), {:controller => 'timelog', :action => 'index', :project_id => @project}) %> |

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