projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.curoverse.com:arvados into 2659-anonymous-share-projects
[arvados.git]
/
services
/
api
/
app
/
models
/
trait.rb
diff --git
a/services/api/app/models/trait.rb
b/services/api/app/models/trait.rb
index d16e7d07a96b55b66b8134aa41a6145548bb1e76..a59c007e77070f1cc01f5107942c4af3e0490e0c 100644
(file)
--- a/
services/api/app/models/trait.rb
+++ b/
services/api/app/models/trait.rb
@@
-1,10
+1,10
@@
class Trait < ArvadosModel
class Trait < ArvadosModel
- include
Assign
Uuid
+ include
Has
Uuid
include KindAndEtag
include CommonApiTemplate
serialize :properties, Hash
include KindAndEtag
include CommonApiTemplate
serialize :properties, Hash
- api_accessible :
superuser, :extend =>
:common do |t|
+ api_accessible :
user, extend:
:common do |t|
t.add :name
t.add :properties
end
t.add :name
t.add :properties
end