diff options
author | Louise Crow <louise.crow@gmail.com> | 2013-09-24 11:35:28 +0100 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2013-09-24 11:35:28 +0100 |
commit | 7f915bf9153cac94ed2f17fee7e7ea2ee9edce8f (patch) | |
tree | 21ead84e0cc9bf8bb28483af0712ab18adc4c318 /app | |
parent | d2cfe4169d06ab6e353e2a229eb8c71e7a655ba4 (diff) | |
parent | 75542416a1cc36b353ade557b1bc4f729b02423a (diff) |
Merge branch 'release/0.14' into rails-3-develop
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/request_controller.rb | 1 | ||||
-rw-r--r-- | app/views/request/_correspondence.html.erb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index b2d228494..388473b51 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -883,6 +883,7 @@ class RequestController < ApplicationController if !File.exists?(cache_file_path) FileUtils.mkdir_p(File.dirname(cache_file_path)) make_request_zip(@info_request, cache_file_path) + File.chmod(0644, cache_file_path) end send_file(cache_file_path, :filename => "#{@info_request.url_title}.zip") end diff --git a/app/views/request/_correspondence.html.erb b/app/views/request/_correspondence.html.erb index 872761749..c39625c3c 100644 --- a/app/views/request/_correspondence.html.erb +++ b/app/views/request/_correspondence.html.erb @@ -5,7 +5,7 @@ <% when 'sent', 'followup_sent' %> <%= render :partial => 'request/outgoing_correspondence', :locals => { :outgoing_message => info_request_event.outgoing_message, :info_request_event => info_request_event }%> <% when 'resent', 'followup_resent' %> - <%= render :partial => 'request/resent_outgoing_correspondence', :locals => { outgoing_message => info_request_event.outgoing_message, :info_request_event => info_request_event }%> + <%= render :partial => 'request/resent_outgoing_correspondence', :locals => { :outgoing_message => info_request_event.outgoing_message, :info_request_event => info_request_event }%> <% when 'comment' %> <%= render :partial => 'comment/single_comment', :locals => { :comment => info_request_event.comment } %> <% end %> |