Defect #35927 » 35927.patch
| app/models/time_entry.rb | ||
|---|---|---|
| 240 | 240 |
def assignable_users |
| 241 | 241 |
users = [] |
| 242 | 242 |
if project |
| 243 |
users = project.members.active.preload(:user) |
|
| 244 |
users = users.map(&:user).select{|u| u.allowed_to?(:log_time, project)}
|
|
| 243 |
user_ids = |
|
| 244 |
project.members.active.preload(:roles).filter_map do |m| |
|
| 245 |
m.roles.any? {|role| role.allowed_to?(:log_time)} ? m.user_id : nil
|
|
| 246 |
end.uniq |
|
| 247 |
users = User.where(:id => user_ids).to_a |
|
| 245 | 248 |
end |
| 246 | 249 |
users << User.current if User.current.logged? && !users.include?(User.current) |
| 247 | 250 |
users |