projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 7490-datamanager-dont-die-return-error
[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 0806a0a4297e57c9c546a3a5d724c56a19e6c32f..f8b359c89060cd9d2703b9303cffaf40f5eef54f 100644
(file)
--- a/
apps/workbench/app/controllers/collections_controller.rb
+++ b/
apps/workbench/app/controllers/collections_controller.rb
@@
-1,6
+1,5
@@
require "arvados/keep"
require "uri"
require "arvados/keep"
require "uri"
-require "cgi"
class CollectionsController < ApplicationController
include ActionController::Live
class CollectionsController < ApplicationController
include ActionController::Live
@@
-369,9
+368,9
@@
class CollectionsController < ApplicationController
uri.path += 't=' + opts[:path_token] + '/'
end
uri.path += '_/'
uri.path += 't=' + opts[:path_token] + '/'
end
uri.path += '_/'
- uri.path +=
CGI::
escape(file)
+ uri.path +=
URI.
escape(file)
- query =
CGI::parse(uri.query || '')
+ query =
Hash[URI.decode_www_form(uri.query || '')]
{ query_token: 'api_token',
disposition: 'disposition' }.each do |opt, param|
if opts.include? opt
{ query_token: 'api_token',
disposition: 'disposition' }.each do |opt, param|
if opts.include? opt
@@
-379,7
+378,7
@@
class CollectionsController < ApplicationController
end
end
unless query.empty?
end
end
unless query.empty?
- uri.query =
query.to_query
+ uri.query =
URI.encode_www_form(query)
end
uri.to_s
end
uri.to_s