Merge branch '16809-s3-v4-signature'

[arvados.git] / services / api / app / controllers / arvados / v1 / groups_controller.rb

diff --git a/services/api/app/controllers/arvados/v1/groups_controller.rb b/services/api/app/controllers/arvados/v1/groups_controller.rb
index dcaeeb069d6f58e8ddf379778b87b0a4cd67f093..46d3a75a3a24407ac8ecb1541f2e646b89daf946 100644 (file)
--- a/services/api/app/controllers/arvados/v1/groups_controller.rb
+++ b/services/api/app/controllers/arvados/v1/groups_controller.rb
@@ -23,7 +23,7 @@ class Arvados::V1::GroupsController < ApplicationController
     (super rescue {}).
       merge({
         include_trash: {
-          type: 'boolean', required: false, description: "Include items whose is_trashed attribute is true."
+          type: 'boolean', required: false, description: "Show group/project even if its is_trashed attribute is true."
         },
       })
   end
@@ -37,6 +37,9 @@ class Arvados::V1::GroupsController < ApplicationController
               recursive: {
                 type: 'boolean', required: false, description: 'Include contents from child groups recursively.'
               },
+              include: {
+                type: 'string', required: false, description: 'Include objects referred to by listed field in "included" (only owner_uuid)'
+              }
             })
     params.delete(:select)
     params
@@ -201,7 +204,7 @@ class Arvados::V1::GroupsController < ApplicationController
     table_names = Hash[klasses.collect { |k| [k, k.table_name] }]
 
     disabled_methods = Rails.configuration.API.DisabledAPIs
-    avail_klasses = table_names.select{|k, t| !disabled_methods.include?(t+'.index')}
+    avail_klasses = table_names.select{|k, t| !disabled_methods[t+'.index']}
     klasses = avail_klasses.keys
 
     request_filters.each do |col, op, val|