projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cf736bb
)
18691: Add parens to clarify operator precedence.
author
Tom Clegg <tom@curii.com>
Thu, 17 Mar 2022 19:12:46 +0000
(15:12 -0400)
committer
Tom Clegg <tom@curii.com>
Thu, 17 Mar 2022 19:12:46 +0000
(15:12 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
services/api/app/models/group.rb
patch
|
blob
|
history
diff --git
a/services/api/app/models/group.rb
b/services/api/app/models/group.rb
index d2c332b9b1ff7e3f405c40738ae56b1d9b7737b6..f56c3281d7ac5392af325932f737d756dfe28cc5 100644
(file)
--- a/
services/api/app/models/group.rb
+++ b/
services/api/app/models/group.rb
@@
-116,7
+116,7
@@
class Group < ArvadosModel
if !new_record? && !current_user.can?(manage: uuid)
raise PermissionDeniedError
end
- if trash_at || delete_at ||
!new_record? && TrashedGroup.where(group_uuid: uuid).any?
+ if trash_at || delete_at ||
(!new_record? && TrashedGroup.where(group_uuid: uuid).any?)
errors.add(:frozen_by_uuid, "cannot be set on a trashed project")
end
if frozen_by_uuid_was.nil?