projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
12032: Rename permission_view and remove Rails permission cache.
[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 6bac512043706c70675ef333ab4ff535894c4662..d09283d928617b15f6ea2b820a6d4eb3b06e734a 100644
(file)
--- a/
services/api/app/controllers/application_controller.rb
+++ b/
services/api/app/controllers/application_controller.rb
@@
-1,3
+1,7
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
require 'safe_json'
module ApiTemplateOverride
require 'safe_json'
module ApiTemplateOverride
@@
-83,9
+87,6
@@
class ApplicationController < ActionController::Base
end
def index
end
def index
- if @select.nil? || @select.include?("id")
- @objects = @objects.uniq(&:id)
- end
if params[:eager] and params[:eager] != '0' and params[:eager] != 0 and params[:eager] != ''
@objects.each(&:eager_load_associations)
end
if params[:eager] and params[:eager] != '0' and params[:eager] != 0 and params[:eager] != ''
@objects.each(&:eager_load_associations)
end
@@
-179,7
+180,7
@@
class ApplicationController < ActionController::Base
end
def find_objects_for_index
end
def find_objects_for_index
- @objects ||= model_class.readable_by(*@read_users)
+ @objects ||= model_class.readable_by(*@read_users
, {:include_trash => (params[:include_trash] || 'untrash' == action_name)}
)
apply_where_limit_order_params
end
apply_where_limit_order_params
end
@@
-283,7
+284,7
@@
class ApplicationController < ActionController::Base
limit_query = @objects.
except(:select, :distinct).
select("(%s) as read_length" %
limit_query = @objects.
except(:select, :distinct).
select("(%s) as read_length" %
- limit_columns.map { |s| "octet_length(#{s})" }.join(" + "))
+ limit_columns.map { |s| "octet_length(#{
model_class.table_name}.#{
s})" }.join(" + "))
new_limit = 0
read_total = 0
limit_query.each do |record|
new_limit = 0
read_total = 0
limit_query.each do |record|