diff options
| -rw-r--r-- | app/models/time_entry.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb index 4a3a79987..f20958894 100644 --- a/app/models/time_entry.rb +++ b/app/models/time_entry.rb @@ -243,8 +243,11 @@ class TimeEntry < ApplicationRecord def assignable_users users = [] if project - users = project.members.active.preload(:user) - users = users.map(&:user).select{|u| u.allowed_to?(:log_time, project)} + user_ids = + project.members.active.preload(:roles).filter_map do |m| + m.roles.any? {|role| role.allowed_to?(:log_time)} ? m.user_id : nil + end.uniq + users = User.where(:id => user_ids).sorted.to_a end users << User.current if User.current.logged? && !users.include?(User.current) users |