From 83975c848c9e453e5936ccee3dc5221871758a8a Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Thu, 18 Apr 2013 12:47:48 +1000 Subject: Simple solution to bugs shown up in tests in last 2 commits --- app/models/info_request.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models/info_request.rb') diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 156399b99..5d8e10ddb 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -639,7 +639,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') # Followups can set the status to waiting response / internal # review. Initial requests ('sent') set the status to waiting response. -- cgit v1.2.3 From 7deabcc40c6b40ad47dff2809c772e2186bd11d1 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Sat, 20 Apr 2013 09:37:13 +1000 Subject: How we would handle event states if we added a state_update event whenever a user classifies a request --- app/models/info_request.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models/info_request.rb') diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 5d8e10ddb..c615a6a9e 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -639,7 +639,7 @@ public event.save! end curr_state = nil - elsif !curr_state.nil? && (event.event_type == 'followup_sent' || event.event_type == 'sent') + 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. -- cgit v1.2.3 From 81090b8eb2d8d24072807062ccd5f32c8074069e Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Sat, 20 Apr 2013 10:38:49 +1000 Subject: Now record a state_update event *whenever* a user classifies a request --- app/models/info_request.rb | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'app/models/info_request.rb') diff --git a/app/models/info_request.rb b/app/models/info_request.rb index c615a6a9e..adb944a7e 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -577,16 +577,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 -- cgit v1.2.3