Merge remote-tracking branch 'openaustralia_github/tests_set_described_state' into rails-3-develop

Conflicts:
    spec/models/info_request_spec.rb

1 files changed, 1 insertions, 11 deletions

diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index 46c247fa9..8f15a4ea4 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -584,16 +584,6 @@ public
         end
 
         unless set_by.nil? || is_actual_owning_user?(set_by) || described_state == 'attention_requested'
-            # Log the status change by someone other than the requester
-            event = log_event("status_update",
-                { :user_id => set_by.id,
-                  :old_described_state => old_described_state,
-                  :described_state => described_state,
-                })
-            # Create a classification event for league tables
-            RequestClassification.create!(:user_id => set_by.id,
-                                          :info_request_event_id => event.id)
-
             RequestMailer.old_unclassified_updated(self).deliver if !is_external?
         end
     end
@@ -646,7 +636,7 @@ public
                     event.save!
                 end
                 curr_state = nil
-            elsif !curr_state.nil? && (event.event_type == 'followup_sent' || event.event_type == 'sent') && !event.described_state.nil? && (event.described_state == 'waiting_response' || event.described_state == 'internal_review')
+            elsif !curr_state.nil? && (event.event_type == 'followup_sent' || event.event_type == 'sent' || event.event_type == "status_update")
                 # Followups can set the status to waiting response / internal
                 # review. Initial requests ('sent') set the status to waiting response.