Merge branch 'master' into 2767-doc-updates

[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 f57cf0d58d8deba2562d0cbdd39068f98e3e81f4..f05571651ddc328079ab770de6e6a6c83e971a1c 100644 (file)
--- a/services/api/app/models/group.rb
+++ b/services/api/app/models/group.rb
@@ -1,10 +1,15 @@
-class Group < OrvosModel
-  include AssignUuid
+require 'can_be_an_owner'
+
+class Group < ArvadosModel
+  include HasUuid
   include KindAndEtag
   include CommonApiTemplate
+  include CanBeAnOwner
 
-  api_accessible :superuser, :extend => :common do |t|
+  api_accessible :user, extend: :common do |t|
     t.add :name
+    t.add :group_class
     t.add :description
+    t.add :writable_by
   end
 end