projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16144: Adds more checks and simplifies nested conditionals.
[arvados.git]
/
services
/
api
/
app
/
models
/
group.rb
diff --git
a/services/api/app/models/group.rb
b/services/api/app/models/group.rb
index 0dd2a73576c00a32e6310307798e8acf9a4de0cf..1f2b0d8b776a1f63ca94d0e3e7654e7f9cd5887b 100644
(file)
--- a/
services/api/app/models/group.rb
+++ b/
services/api/app/models/group.rb
@@
-3,12
+3,20
@@
# SPDX-License-Identifier: AGPL-3.0
require 'can_be_an_owner'
# SPDX-License-Identifier: AGPL-3.0
require 'can_be_an_owner'
+require 'trashable'
class Group < ArvadosModel
include HasUuid
include KindAndEtag
include CommonApiTemplate
include CanBeAnOwner
class Group < ArvadosModel
include HasUuid
include KindAndEtag
include CommonApiTemplate
include CanBeAnOwner
+ include Trashable
+
+ # Posgresql JSONB columns should NOT be declared as serialized, Rails 5
+ # already know how to properly treat them.
+ attribute :properties, :jsonbHash, default: {}
+
+ validate :ensure_filesystem_compatible_name
after_create :invalidate_permissions_cache
after_update :maybe_invalidate_permissions_cache
before_create :assign_name
after_create :invalidate_permissions_cache
after_update :maybe_invalidate_permissions_cache
before_create :assign_name
@@
-18,10
+26,20
@@
class Group < ArvadosModel
t.add :group_class
t.add :description
t.add :writable_by
t.add :group_class
t.add :description
t.add :writable_by
+ t.add :delete_at
+ t.add :trash_at
+ t.add :is_trashed
+ t.add :properties
+ end
+
+ def ensure_filesystem_compatible_name
+ # project groups need filesystem-compatible names, but others
+ # don't.
+ super if group_class == 'project'
end
def maybe_invalidate_permissions_cache
end
def maybe_invalidate_permissions_cache
- if uuid_changed? or owner_uuid_changed?
+ if uuid_changed? or owner_uuid_changed?
or is_trashed_changed?
# This can change users' permissions on other groups as well as
# this one.
invalidate_permissions_cache
# This can change users' permissions on other groups as well as
# this one.
invalidate_permissions_cache
@@
-31,7
+49,7
@@
class Group < ArvadosModel
def invalidate_permissions_cache
# Ensure a new group can be accessed by the appropriate users
# immediately after being created.
def invalidate_permissions_cache
# Ensure a new group can be accessed by the appropriate users
# immediately after being created.
- User.invalidate_permissions_cache
db_current_time.to_i
+ User.invalidate_permissions_cache
self.async_permissions_update
end
def assign_name
end
def assign_name
@@
-40,5
+58,4
@@
class Group < ArvadosModel
end
true
end
end
true
end
-
end
end