diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-12-18 13:30:54 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-12-18 13:30:54 +0000 |
| commit | f0bbeb4abf4bf07e5cfb46668f39bbff72ed7210 (patch) | |
| tree | 25284f5c0b3827afbd38443902cc2ee5337b4fe6 | |
| parent | ef37cb19c5340ddfbc90e5269ae473edb939270d (diff) | |
| parent | a21420efff11968c58c9d220ea5f9974142056b6 (diff) | |
Merge branch 'hotfix/0.20.0.1' into rails-3-develop
| -rw-r--r-- | app/models/public_body.rb | 5 | ||||
| -rw-r--r-- | config/general.yml-example | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/app/models/public_body.rb b/app/models/public_body.rb index 1929272ea..a9cdfeab2 100644 --- a/app/models/public_body.rb +++ b/app/models/public_body.rb @@ -454,11 +454,12 @@ class PublicBody < ActiveRecord::Base # of updating them bodies_by_name = {} set_of_existing = Set.new() + internal_admin_body_id = PublicBody.internal_admin_body.id I18n.with_locale(I18n.default_locale) do - bodies = (tag.nil? || tag.empty?) ? PublicBody.find(:all) : PublicBody.find_by_tag(tag) + bodies = (tag.nil? || tag.empty?) ? PublicBody.find(:all, :include => :translations) : PublicBody.find_by_tag(tag) for existing_body in bodies # Hide InternalAdminBody from import notes - next if existing_body.id == PublicBody.internal_admin_body.id + next if existing_body.id == internal_admin_body_id bodies_by_name[existing_body.name] = existing_body set_of_existing.add(existing_body.name) diff --git a/config/general.yml-example b/config/general.yml-example index 22d4d45aa..5be62ee21 100644 --- a/config/general.yml-example +++ b/config/general.yml-example @@ -174,7 +174,7 @@ REPLY_LATE_AFTER_DAYS: 20 REPLY_VERY_LATE_AFTER_DAYS: 40 SPECIAL_REPLY_VERY_LATE_AFTER_DAYS: 60 -# The WORKING_OR_CALENDAR_DAYS setting can be either "working" (the default) or +# The WORKING_OR_CALENDAR_DAYS setting can be either "working" (the default) or # "calendar", and determines which days are counted when calculating whether a # request is officially late. # @@ -195,7 +195,7 @@ WORKING_OR_CALENDAR_DAYS: working # *Warning:* this is slow — don't use in production! # # FRONTPAGE_PUBLICBODY_EXAMPLES - String semicolon-separated list of public -# bodies (default: nil) +# bodies (default: nil) # # Examples: # |