diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-04-24 08:36:36 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-04-24 08:36:36 +0100 |
| commit | 36dd0b85ce84537192b32a3452b67298e965c21f (patch) | |
| tree | 5b274129d6a8d616f52c0d2dae39f9c0fac434b9 /app/controllers/admin_general_controller.rb | |
| parent | 2e2613639f9529e67b9509b6a07fea5bf3de8459 (diff) | |
| parent | 867702601b61567e489361776b071dff2455fe60 (diff) | |
Merge remote-tracking branch 'openaustralia_github/email-missing-defunct' into rails-3-develop
Diffstat (limited to 'app/controllers/admin_general_controller.rb')
| -rw-r--r-- | app/controllers/admin_general_controller.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/admin_general_controller.rb b/app/controllers/admin_general_controller.rb index f2414eeab..13edec37d 100644 --- a/app/controllers/admin_general_controller.rb +++ b/app/controllers/admin_general_controller.rb @@ -23,8 +23,7 @@ class AdminGeneralController < AdminController @requires_admin_requests = InfoRequest.find_in_state('requires_admin') @error_message_requests = InfoRequest.find_in_state('error_message') @attention_requests = InfoRequest.find_in_state('attention_requested') - @blank_contacts = PublicBody.find(:all, :conditions => ["request_email = ''"], - :order => "updated_at") + @blank_contacts = PublicBody.where(:request_email => "").order(:updated_at).select { |pb| !pb.defunct? } @old_unclassified = InfoRequest.find_old_unclassified(:limit => 20, :conditions => ["prominence = 'normal'"]) @holding_pen_messages = InfoRequest.holding_pen_request.incoming_messages |