projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
20846: Merge branch '19213-ubuntu2204-support' into 20846-ubuntu2204
[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 9073d06c178c3edeb23bee3b3d16cfcafca5f4ff..812b80b8ce739a93066771cdd488243c84da5187 100644
(file)
--- a/
apps/workbench/app/controllers/collections_controller.rb
+++ b/
apps/workbench/app/controllers/collections_controller.rb
@@
-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
@@
-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',