diff options
| author | Seb Bacon <seb@mysociety.org> | 2012-01-09 09:37:48 +0000 |
|---|---|---|
| committer | Seb Bacon <seb@mysociety.org> | 2012-01-09 09:37:48 +0000 |
| commit | 4f8ff37a127d5f82e63f500a84d22e8b07ab8843 (patch) | |
| tree | 568a051bdf11be4099e2ac023aa0cb0d2c28594f /app/controllers | |
| parent | db9eb3724242e82d4275418002e135f6b1c056e9 (diff) | |
| parent | 848483381694e67999e446d3784b0c32dfdc3f8d (diff) | |
Merge branch 'release/0.5' into develop
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/public_body_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/request_controller.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/public_body_controller.rb b/app/controllers/public_body_controller.rb index 62229a441..c31134641 100644 --- a/app/controllers/public_body_controller.rb +++ b/app/controllers/public_body_controller.rb @@ -129,7 +129,7 @@ class PublicBodyController < ApplicationController end PublicBody.with_locale(@locale) do @public_bodies = PublicBody.paginate( - :order => "public_body_translations.name", :page => params[:page], :per_page => 1000, # fit all councils on one page + :order => "public_body_translations.name", :page => params[:page], :per_page => 100, :conditions => conditions, :joins => :translations ) diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index 8672fdf75..f3bbd6708 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -814,7 +814,8 @@ class RequestController < ApplicationController for message in info_request.incoming_messages attachments = message.get_attachments_for_display for attachment in attachments - zipfile.get_output_stream(attachment.display_filename) { |f| + filename = "#{attachment.url_part_number}_#{attachment.display_filename}" + zipfile.get_output_stream(filename) { |f| f.puts(attachment.body) } end |