projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '14714-keep-balance-config'
[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 46bb447d10f507b6e4fe03b7983e6cfa25111016..7fb8fef42ba9e4c1b19967174cd30c9991383726 100644
(file)
--- a/
services/api/app/models/group.rb
+++ b/
services/api/app/models/group.rb
@@
-12,7
+12,9
@@
class Group < ArvadosModel
include CanBeAnOwner
include Trashable
include CanBeAnOwner
include Trashable
- serialize :properties, Hash
+ # Posgresql JSONB columns should NOT be declared as serialized, Rails 5
+ # already know how to properly treat them.
+ attribute :properties, :jsonbHash, default: {}
after_create :invalidate_permissions_cache
after_update :maybe_invalidate_permissions_cache
after_create :invalidate_permissions_cache
after_update :maybe_invalidate_permissions_cache
@@
-49,5
+51,4
@@
class Group < ArvadosModel
end
true
end
end
true
end
-
end
end