diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-05-25 12:30:50 +0100 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-05-25 12:30:50 +0100 |
| commit | c1256d99630d82be1085f943d35abb3e407f6093 (patch) | |
| tree | 55663b3284f2b969363e76f02e451a1fc5f6d790 /app/models | |
| parent | 88d5103ec40120b64a7579994ad2f11334dee71a (diff) | |
| parent | b58f2d6b2847f5d438468bfdd317308f60d32be3 (diff) | |
Merge branch 'master' into wdtk
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/public_body.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/public_body.rb b/app/models/public_body.rb index 961fa3cbb..90e9395ae 100644 --- a/app/models/public_body.rb +++ b/app/models/public_body.rb @@ -240,7 +240,7 @@ class PublicBody < ActiveRecord::Base # Return the short name if present, or else long name def short_or_long_name if self.short_name.nil? || self.short_name.empty? # 'nil' can happen during construction - self.name + self.name.nil? ? "" : self.name else self.short_name end |