projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
20846: Remove deprecated Random::DEFAULT usage.
[arvados.git]
/
apps
/
workbench
/
app
/
controllers
/
collections_controller.rb
diff --git
a/apps/workbench/app/controllers/collections_controller.rb
b/apps/workbench/app/controllers/collections_controller.rb
index de20b8858ac6c5857eed076c507680ee478fab9c..812b80b8ce739a93066771cdd488243c84da5187 100644
(file)
--- a/
apps/workbench/app/controllers/collections_controller.rb
+++ b/
apps/workbench/app/controllers/collections_controller.rb
@@
-36,7
+36,7
@@
class CollectionsController < ApplicationController
['link_class', '=', 'resources'],
['name', '=', 'wants'],
['tail_uuid', '=', current_user.uuid],
['link_class', '=', 'resources'],
['name', '=', 'wants'],
['tail_uuid', '=', current_user.uuid],
- ['head_uuid', '=', @object.uuid]])
+ ['head_uuid', '=', @object.uuid]])
.with_count("none")
logger.debug persist_links.inspect
else
return unprocessable "Invalid value #{value.inspect}"
logger.debug persist_links.inspect
else
return unprocessable "Invalid value #{value.inspect}"
@@
-65,7
+65,7
@@
class CollectionsController < ApplicationController
@select ||= Collection.columns.map(&:name)
base_search = Collection.select(@select)
if params[:search].andand.length.andand > 0
@select ||= Collection.columns.map(&:name)
base_search = Collection.select(@select)
if params[:search].andand.length.andand > 0
- tags = Link.where(any: ['contains', params[:search]])
+ tags = Link.where(any: ['contains', params[:search]])
.with_count("none")
@objects = (base_search.where(uuid: tags.collect(&:head_uuid)) |
base_search.where(any: ['contains', params[:search]])).
uniq { |c| c.uuid }
@objects = (base_search.where(uuid: tags.collect(&:head_uuid)) |
base_search.where(any: ['contains', params[:search]])).
uniq { |c| c.uuid }
@@
-84,7
+84,7
@@
class CollectionsController < ApplicationController
@objects = base_search.limit(limit).offset(offset)
end
@objects = base_search.limit(limit).offset(offset)
end
- @links = Link.where(head_uuid: @objects.collect(&:uuid))
+ @links = Link.where(head_uuid: @objects.collect(&:uuid))
.with_count("none")
@collection_info = {}
@objects.each do |c|
@collection_info[c.uuid] = {
@collection_info = {}
@objects.each do |c|
@collection_info[c.uuid] = {
@@
-197,19
+197,19
@@
class CollectionsController < ApplicationController
else
if Job.api_exists?(:index)
jobs_with = lambda do |conds|
else
if Job.api_exists?(:index)
jobs_with = lambda do |conds|
- Job.limit(RELATION_LIMIT).where(conds)
+ Job.limit(RELATION_LIMIT).w
ith_count("none").w
here(conds)
.results.sort_by { |j| j.finished_at || j.created_at }
end
@output_of = jobs_with.call(output: @object.portable_data_hash)
@log_of = jobs_with.call(log: @object.portable_data_hash)
end
.results.sort_by { |j| j.finished_at || j.created_at }
end
@output_of = jobs_with.call(output: @object.portable_data_hash)
@log_of = jobs_with.call(log: @object.portable_data_hash)
end
- @project_links = Link.limit(RELATION_LIMIT).order("modified_at DESC")
+ @project_links = Link.limit(RELATION_LIMIT).
with_count("none").
order("modified_at DESC")
.where(head_uuid: @object.uuid, link_class: 'name').results
.where(head_uuid: @object.uuid, link_class: 'name').results
- project_hash = Group.where(uuid: @project_links.map(&:tail_uuid)).to_hash
+ project_hash = Group.where(uuid: @project_links.map(&:tail_uuid)).
with_count("none").
to_hash
@projects = project_hash.values
@projects = project_hash.values
- @permissions = Link.limit(RELATION_LIMIT).order("modified_at DESC")
+ @permissions = Link.limit(RELATION_LIMIT).
with_count("none").
order("modified_at DESC")
.where(head_uuid: @object.uuid, link_class: 'permission',
name: 'can_read').results
@search_sharing = search_scopes
.where(head_uuid: @object.uuid, link_class: 'permission',
name: 'can_read').results
@search_sharing = search_scopes
@@
-258,7
+258,7
@@
class CollectionsController < ApplicationController
arv_coll.rm "."+p
end
arv_coll.rm "."+p
end
- if @object.update
_attributes
manifest_text: arv_coll.manifest_text
+ if @object.update manifest_text: arv_coll.manifest_text
show
else
self.render_error status: 422
show
else
self.render_error status: 422
@@
-289,7
+289,7
@@
class CollectionsController < ApplicationController
else
arv_coll.rename "./"+file_path, new_file_path
else
arv_coll.rename "./"+file_path, new_file_path
- if @object.update
_attributes
manifest_text: arv_coll.manifest_text
+ if @object.update manifest_text: arv_coll.manifest_text
show
else
self.render_error status: 422
show
else
self.render_error status: 422
@@
-343,7
+343,7
@@
class CollectionsController < ApplicationController
# Prefer the attachment-only-host when we want an attachment
# (and when there is no preview link configured)
tmpl = Rails.configuration.Services.WebDAVDownload.ExternalURL.to_s
# Prefer the attachment-only-host when we want an attachment
# (and when there is no preview link configured)
tmpl = Rails.configuration.Services.WebDAVDownload.ExternalURL.to_s
- elsif not Rails.configuration.
Workbench
.TrustAllContent
+ elsif not Rails.configuration.
Collections
.TrustAllContent
check_uri = URI.parse(tmpl.sub("*", munged_id))
if opts[:query_token] and
(check_uri.host.nil? or (
check_uri = URI.parse(tmpl.sub("*", munged_id))
if opts[:query_token] and
(check_uri.host.nil? or (
@@
-376,7
+376,7
@@
class CollectionsController < ApplicationController
uri.path += 't=' + opts[:path_token] + '/'
end
uri.path += '_/'
uri.path += 't=' + opts[:path_token] + '/'
end
uri.path += '_/'
- uri.path +=
URI.escape(file
) if file
+ uri.path +=
ERB::Util.url_encode(file).gsub('%2F', '/'
) if file
query = Hash[URI.decode_www_form(uri.query || '')]
{ query_token: 'api_token',
query = Hash[URI.decode_www_form(uri.query || '')]
{ query_token: 'api_token',