projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
4464: API group contents no longer include manifests.
[arvados.git]
/
services
/
api
/
app
/
controllers
/
application_controller.rb
diff --git
a/services/api/app/controllers/application_controller.rb
b/services/api/app/controllers/application_controller.rb
index a65bf3e328697da220d111c8be36460de82220bd..69c03bde9fc0a1b22ca7a39a3bb7a78d94dd471c 100644
(file)
--- a/
services/api/app/controllers/application_controller.rb
+++ b/
services/api/app/controllers/application_controller.rb
@@
-205,8
+205,9
@@
class ApplicationController < ActionController::Base
end
end
end
end
- def apply_where_limit_order_params *args
- apply_filters *args
+ def apply_where_limit_order_params model_class=nil
+ model_class ||= self.model_class
+ apply_filters model_class
ar_table_name = @objects.table_name
if @where.is_a? Hash and @where.any?
ar_table_name = @objects.table_name
if @where.is_a? Hash and @where.any?
@@
-271,7
+272,7
@@
class ApplicationController < ActionController::Base
columns_list = @select.
flat_map { |attr| api_column_map[attr] }.
uniq.
columns_list = @select.
flat_map { |attr| api_column_map[attr] }.
uniq.
- map { |s| "#{table_name}.#{ActiveRecord::Base.connection.quote_column_name s}" }
+ map { |s| "#{
ar_
table_name}.#{ActiveRecord::Base.connection.quote_column_name s}" }
@objects = @objects.select(columns_list.join(", "))
end
@objects = @objects.select(columns_list.join(", "))
end
@@
-436,8
+437,8
@@
class ApplicationController < ActionController::Base
end
accept_param_as_json :reader_tokens, Array
end
accept_param_as_json :reader_tokens, Array
- def
render
_list
-
@object_
list = {
+ def
object
_list
+ list = {
:kind => "arvados##{(@response_resource_name || resource_name).camelize(:lower)}List",
:etag => "",
:self_link => "",
:kind => "arvados##{(@response_resource_name || resource_name).camelize(:lower)}List",
:etag => "",
:self_link => "",
@@
-446,11
+447,15
@@
class ApplicationController < ActionController::Base
:items => @objects.as_api_response(nil, {select: @select})
}
if @objects.respond_to? :except
:items => @objects.as_api_response(nil, {select: @select})
}
if @objects.respond_to? :except
-
@object_
list[:items_available] = @objects.
+ list[:items_available] = @objects.
except(:limit).except(:offset).
count(:id, distinct: true)
end
except(:limit).except(:offset).
count(:id, distinct: true)
end
- send_json @object_list
+ list
+ end
+
+ def render_list
+ send_json object_list
end
def remote_ip
end
def remote_ip