projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Finished improving rendering of UUIDs for now.
[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 763d3a65d400c25b8f5929626b89aeb91a2b47a2..5d5eb79e520996ed53dc6a2afa4d76fbabdbcaea 100644
(file)
--- a/
apps/workbench/app/controllers/collections_controller.rb
+++ b/
apps/workbench/app/controllers/collections_controller.rb
@@
-49,6
+49,8
@@
class CollectionsController < ApplicationController
end
self.response.headers['Content-Type'] =
Rack::Mime::MIME_TYPES[ext] || 'application/octet-stream'
end
self.response.headers['Content-Type'] =
Rack::Mime::MIME_TYPES[ext] || 'application/octet-stream'
+ self.response.headers['Content-Length'] = params[:size] if params[:size]
+ self.response.headers['Content-Disposition'] = params[:disposition] if params[:disposition]
self.response_body = FileStreamer.new opts
end
self.response_body = FileStreamer.new opts
end
@@
-122,7
+124,7
@@
class CollectionsController < ApplicationController
yield buf
end
end
yield buf
end
end
- Rails.logger.warn("#{@opts[:uuid]}/#{@opts[:file]}:
$?
") if $? != 0
+ Rails.logger.warn("#{@opts[:uuid]}/#{@opts[:file]}:
#{$?}
") if $? != 0
end
end
end
end
end
end