diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-02-03 13:39:24 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-02-03 13:39:24 +0000 |
| commit | bf4bbc351dae8e97d09b87434cef4f44eea4d73a (patch) | |
| tree | 2f43c9c02205fec1fb68cdcb66735d5b1ee3172f /app | |
| parent | ea04caec95cea132143997a1870ae8dd1fc0db5c (diff) | |
| parent | 14b5be69dc2dc3c4dd817feb0b5a8402fc343db4 (diff) | |
Merge branch 'release/0.5' into develop
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/help_controller.rb | 12 | ||||
| -rw-r--r-- | app/models/public_body.rb | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb index 9b00846ee..b08438b52 100644 --- a/app/controllers/help_controller.rb +++ b/app/controllers/help_controller.rb @@ -31,15 +31,15 @@ class HelpController < ApplicationController end # look up link to request/body - @last_request_id = cookies["last_request_id"].to_i - if @last_request_id > 0 - @last_request = InfoRequest.find(@last_request_id) + last_request_id = cookies["last_request_id"].to_i + if last_request_id > 0 + @last_request = InfoRequest.find(last_request_id) else @last_request = nil end - @last_body_id = cookies["last_body_id"].to_i - if @last_body_id > 0 - @last_body = PublicBody.find(@last_body_id) + last_body_id = cookies["last_body_id"].to_i + if last_body_id > 0 + @last_body = PublicBody.find(last_body_id) else @last_body = nil end diff --git a/app/models/public_body.rb b/app/models/public_body.rb index 9ac668b10..961fa3cbb 100644 --- a/app/models/public_body.rb +++ b/app/models/public_body.rb @@ -395,7 +395,7 @@ class PublicBody < ActiveRecord::Base field_list = ['name', 'short_name', 'request_email', 'notes', 'publication_scheme', 'home_page', 'tag_string'] - if public_body = bodies_by_name[name] # Existing public body + if public_body = bodies_by_name[name] # Existing public body available_locales.each do |locale| PublicBody.with_locale(locale) do changed = ActiveSupport::OrderedHash.new |