jro_apps/redmine Commit - r13893:6659aad3ef65

db/migrate/20150526183158_add_roles_time_entries_visibility.rb created 644 +9 0

@@ -0,0 +1,9
	1	class AddRolesTimeEntriesVisibility < ActiveRecord::Migration
	2	def self.up
	3	add_column :roles, :time_entries_visibility, :string, :limit => 30, :default => 'all', :null => false
	4	end
	5
	6	def self.down
	7	remove_column :roles, :time_entries_visibility
	8	end
	9	end

app/controllers/projects_controller.rb +1 -1

                 @open_issues_by_tracker = Issue.visible.open.where(cond).group(:tracker).count
                 @total_issues_by_tracker = Issue.visible.where(cond).group(:tracker).count
-                if User.current.allowed_to?(:view_time_entries, @project)
+                if User.current.allowed_to_view_all_time_entries?(@project)
                   @total_hours = TimeEntry.visible.where(cond).sum(:hours).to_f
                 end

app/models/role.rb +8 0

                 ['own', :label_issues_visibility_own]
               ]
+              TIME_ENTRIES_VISIBILITY_OPTIONS = [
+                ['all', :label_time_entries_visibility_all],
+                ['own', :label_time_entries_visibility_own]
+              ]
               USERS_VISIBILITY_OPTIONS = [
                 ['all', :label_users_visibility_all],
                 ['members_of_visible_projects', :label_users_visibility_members_of_visible_projects]
               validates_inclusion_of :users_visibility,
                 :in => USERS_VISIBILITY_OPTIONS.collect(&:first),
                 :if => lambda {|role| role.respond_to?(:users_visibility) && role.users_visibility_changed?}
+              validates_inclusion_of :time_entries_visibility,
+                :in => TIME_ENTRIES_VISIBILITY_OPTIONS.collect(&:first),
+                :if => lambda {|role| role.respond_to?(:time_entries_visibility) && role.time_entries_visibility_changed?}
               # Copies attributes from another role, arg can be an id or a Role
               def copy_from(arg, options={})

app/models/time_entry.rb +30 -2

@@ -46,7 +46,7 class TimeEntry < ActiveRecord::Base
46		46
47	scope :visible, lambda {\|*args\|	47	scope :visible, lambda {\|*args\|
48	joins(:project).	48	joins(:project).
49	where(~~Project~~.~~allowed_to~~_condition(args.shift \|\| User.current, ~~:view_time_entries~~, *args))	49	where(TimeEntry.visible_condition(args.shift \|\| User.current, *args))
50	}	50	}
51	scope :on_issue, lambda {\|issue\|	51	scope :on_issue, lambda {\|issue\|
52	joins(:issue).	52	joins(:issue).
@@ -55,6 +55,32 class TimeEntry < ActiveRecord::Base
55		55
56	safe_attributes 'hours', 'comments', 'project_id', 'issue_id', 'activity_id', 'spent_on', 'custom_field_values', 'custom_fields'	56	safe_attributes 'hours', 'comments', 'project_id', 'issue_id', 'activity_id', 'spent_on', 'custom_field_values', 'custom_fields'
57		57
		58	# Returns a SQL conditions string used to find all time entries visible by the specified user
		59	def self.visible_condition(user, options={})
		60	Project.allowed_to_condition(user, :view_time_entries, options) do \|role, user\|
		61	if role.time_entries_visibility == 'all'
		62	nil
		63	elsif role.time_entries_visibility == 'own' && user.id && user.logged?
		64	"#{table_name}.user_id = #{user.id}"
		65	else
		66	'1=0'
		67	end
		68	end
		69	end
		70
		71	# Returns true if user or current user is allowed to view the time entry
		72	def visible?(user=nil)
		73	(user \|\| User.current).allowed_to?(:view_time_entries, self.project) do \|role, user\|
		74	if role.time_entries_visibility == 'all'
		75	true
		76	elsif role.time_entries_visibility == 'own'
		77	self.user == user
		78	else
		79	false
		80	end
		81	end
		82	end
		83
58	def initialize(attributes=nil, *args)	84	def initialize(attributes=nil, *args)
59	super	85	super
60	if new_record? && self.activity.nil?	86	if new_record? && self.activity.nil?
@@ -116,7 +142,9 class TimeEntry < ActiveRecord::Base
116		142
117	# Returns true if the time entry can be edited by usr, otherwise false	143	# Returns true if the time entry can be edited by usr, otherwise false
118	def editable_by?(usr)	144	def editable_by?(usr)
119	(usr == user && usr.allowed_to?(:edit_own_time_entries, project)) \|\| usr.allowed_to?(:edit_time_entries, project)	145	visible?(usr) && (
		146	(usr == user && usr.allowed_to?(:edit_own_time_entries, project)) \|\| usr.allowed_to?(:edit_time_entries, project)
		147	)
120	end	148	end
121		149
122	# Returns the custom_field_values that can be edited by the given user	150	# Returns the custom_field_values that can be edited by the given user

app/models/user.rb +6 0

                 allowed_to?(action, nil, options.reverse_merge(:global => true), &block)
               end
+              def allowed_to_view_all_time_entries?(context)
+                allowed_to?(:view_time_entries, context) do |role, user|
+                  role.time_entries_visibility == 'all'
+                end
+              end
               # Returns true if the user is allowed to delete the user's own account
               def own_account_deletable?
                 Setting.unsubscribe? &&

app/views/issues/show.html.erb +1 -1

                   rows.right l(:field_estimated_hours), issue_estimated_hours_details(@issue), :class => 'estimated-hours'
                 end
               end
-              if User.current.allowed_to?(:view_time_entries, @project)
+              if User.current.allowed_to_view_all_time_entries?(@project)
                 if @issue.total_spent_hours > 0
                   rows.right l(:label_spent_time), issue_spent_hours_details(@issue), :class => 'spent-time'
                 end

app/views/projects/_sidebar.html.erb +4 -2

-            <% if @total_hours.present? %>
+            <% if User.current.allowed_to?(:view_time_entries, @project) %>
               <h3><%= l(:label_spent_time) %></h3>
-              <p><span class="icon icon-time"><%= l_hours(@total_hours) %></span></p>
+              <% if @total_hours.present? %>
+                <p><span class="icon icon-time"><%= l_hours(@total_hours) %></span></p>
+              <% end %>
               <p>
               <% if User.current.allowed_to?(:log_time, @project) %>
                 <%= link_to l(:button_log_time), new_project_time_entry_path(@project) %> |

app/views/roles/_form.html.erb +4 0

                 <p><%= f.select :issues_visibility, Role::ISSUES_VISIBILITY_OPTIONS.collect {|v| [l(v.last), v.first]} %></p>
               <% end %>
+              <% unless @role.anonymous? %>
+                <p><%= f.select :time_entries_visibility, Role::TIME_ENTRIES_VISIBILITY_OPTIONS.collect {|v| [l(v.last), v.first]} %></p>
+              <% end %>
               <p><%= f.select :users_visibility, Role::USERS_VISIBILITY_OPTIONS.collect {|v| [l(v.last), v.first]} %></p>
               <% if @role.new_record? && @roles.any? %>

app/views/versions/show.html.erb +1 -1

                 <th><%= l(:field_estimated_hours) %></th>
                 <td class="total-hours"><%= html_hours(l_hours(@version.estimated_hours)) %></td>
             </tr>
-            <% if User.current.allowed_to?(:view_time_entries, @project) %>
+            <% if User.current.allowed_to_view_all_time_entries?(@project) %>
             <tr>
                 <th><%= l(:label_spent_time) %></th>
                 <td class="total-hours"><%= html_hours(l_hours(@version.spent_hours)) %></td>

config/locales/en.yml +1 0

               field_must_change_passwd: Must change password at next logon
               field_default_status: Default status
               field_users_visibility: Users visibility
+              field_time_entries_visibility: Time logs visibility
               setting_app_title: Application title
               setting_app_subtitle: Application subtitle

config/locales/fr.yml +3 0

               field_must_change_passwd: Doit changer de mot de passe à la prochaine connexion
               field_default_status: Statut par défaut
               field_users_visibility: Visibilité des utilisateurs
+              field_time_entries_visibility: Visibilité du temps passé
               setting_app_title: Titre de l'application
               setting_app_subtitle: Sous-titre de l'application
               label_disable_notifications: Désactiver les notifications
               label_blank_value: non renseigné
               label_parent_task_attributes: Attributs des tâches parentes
+              label_time_entries_visibility_all: Tous les temps passés
+              label_time_entries_visibility_own: Ses propres temps passés
               button_login: Connexion
               button_submit: Soumettre

test/unit/time_entry_test.rb +32 0

@@ -27,6 +27,38 class TimeEntryTest < ActiveSupport::TestCase
27	:groups_users,	27	:groups_users,
28	:enabled_modules	28	:enabled_modules
29		29
		30	def test_visibility_with_permission_to_view_all_time_entries
		31	user = User.generate!
		32	role = Role.generate!(:permissions => [:view_time_entries], :time_entries_visibility => 'all')
		33	Role.non_member.remove_permission! :view_time_entries
		34	project = Project.find(1)
		35	User.add_to_project user, project, role
		36	own = TimeEntry.generate! :user => user, :project => project
		37	other = TimeEntry.generate! :user => User.find(2), :project => project
		38
		39	assert TimeEntry.visible(user).find_by_id(own.id)
		40	assert TimeEntry.visible(user).find_by_id(other.id)
		41
		42	assert own.visible?(user)
		43	assert other.visible?(user)
		44	end
		45
		46	def test_visibility_with_permission_to_view_own_time_entries
		47	user = User.generate!
		48	role = Role.generate!(:permissions => [:view_time_entries], :time_entries_visibility => 'own')
		49	Role.non_member.remove_permission! :view_time_entries
		50	project = Project.find(1)
		51	User.add_to_project user, project, role
		52	own = TimeEntry.generate! :user => user, :project => project
		53	other = TimeEntry.generate! :user => User.find(2), :project => project
		54
		55	assert TimeEntry.visible(user).find_by_id(own.id)
		56	assert_nil TimeEntry.visible(user).find_by_id(other.id)
		57
		58	assert own.visible?(user)
		59	assert_equal false, other.visible?(user)
		60	end
		61
30	def test_hours_format	62	def test_hours_format
31	assertions = { "2" => 2.0,	63	assertions = { "2" => 2.0,
32	"21.1" => 21.1,	64	"21.1" => 21.1,

	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