projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 15803-unsetup
[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 6163f893ce7d3c71040f08f2a66d25731bb1ff85..46d3a75a3a24407ac8ecb1541f2e646b89daf946 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/groups_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/groups_controller.rb
@@
-7,8
+7,8
@@
require "trashable"
class Arvados::V1::GroupsController < ApplicationController
include TrashableController
class Arvados::V1::GroupsController < ApplicationController
include TrashableController
- skip_before_
filter
:find_object_by_uuid, only: :shared
- skip_before_
filter
:render_404_if_no_object, only: :shared
+ skip_before_
action
:find_object_by_uuid, only: :shared
+ skip_before_
action
:render_404_if_no_object, only: :shared
def self._index_requires_parameters
(super rescue {}).
def self._index_requires_parameters
(super rescue {}).
@@
-19,6
+19,15
@@
class Arvados::V1::GroupsController < ApplicationController
})
end
})
end
+ def self._show_requires_parameters
+ (super rescue {}).
+ merge({
+ include_trash: {
+ type: 'boolean', required: false, description: "Show group/project even if its is_trashed attribute is true."
+ },
+ })
+ end
+
def self._contents_requires_parameters
params = _index_requires_parameters.
merge({
def self._contents_requires_parameters
params = _index_requires_parameters.
merge({
@@
-28,6
+37,9
@@
class Arvados::V1::GroupsController < ApplicationController
recursive: {
type: 'boolean', required: false, description: 'Include contents from child groups recursively.'
},
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
})
params.delete(:select)
params
@@
-191,8
+203,8
@@
class Arvados::V1::GroupsController < ApplicationController
table_names = Hash[klasses.collect { |k| [k, k.table_name] }]
table_names = Hash[klasses.collect { |k| [k, k.table_name] }]
- disabled_methods = Rails.configuration.
disable_api_method
s
- avail_klasses = table_names.select{|k, t| !disabled_methods
.include?(t+'.index')
}
+ disabled_methods = Rails.configuration.
API.DisabledAPI
s
+ avail_klasses = table_names.select{|k, t| !disabled_methods
[t+'.index']
}
klasses = avail_klasses.keys
request_filters.each do |col, op, val|
klasses = avail_klasses.keys
request_filters.each do |col, op, val|