diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-06-26 13:05:08 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-06-26 13:05:08 -0700 |
| commit | 27d6ad899f594bd9b79e54cdc5a3c17110f3b26c (patch) | |
| tree | b75973ee4325bd11f27220e38d1e899076948c78 /app/controllers/public_body_controller.rb | |
| parent | 9bbc93bfd8ba8aaaf9bd1ad9031368b7faad8239 (diff) | |
| parent | 3194a7801684d010dac94c26cf39bb780bfcd17e (diff) | |
Merge branch 'release/0.12'0.12
Conflicts:
locale/he_IL/app.po
locale/hr_HR/app.po
locale/nb_NO/app.po
locale/uk/app.po
Diffstat (limited to 'app/controllers/public_body_controller.rb')
| -rw-r--r-- | app/controllers/public_body_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/public_body_controller.rb b/app/controllers/public_body_controller.rb index 74ea043bb..374866eda 100644 --- a/app/controllers/public_body_controller.rb +++ b/app/controllers/public_body_controller.rb @@ -131,7 +131,9 @@ class PublicBodyController < ApplicationController @public_bodies = PublicBody.where(conditions).joins(:translations).order("public_body_translations.name").paginate( :page => params[:page], :per_page => 100 ) - render :template => "public_body/list" + respond_to do |format| + format.html { render :template => "public_body/list" } + end end end |