Add an option to calls to calculate_status and display_status to specify that the method can return a value cached on the object by a previous call.

2 files changed, 11 insertions, 12 deletions

diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index 74a67b9d9..47424e573 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -584,12 +584,11 @@ public
     #   waiting_classification
     #   waiting_response_overdue
     #   waiting_response_very_overdue
-    def calculate_status
-        if @@custom_states_loaded
-            return self.theme_calculate_status
-        else
-            self.base_calculate_status
+    def calculate_status(cached_value_ok=false)
+        if cached_value_ok && @cached_calculated_status
+            return @cached_calculated_status
         end
+        @cached_calculated_status = @@custom_states_loaded ? self.theme_calculate_status : self.base_calculate_status
     end
 
     def base_calculate_status
@@ -871,8 +870,8 @@ public
         end
     end
 
-    def display_status
-        InfoRequest.get_status_description(self.calculate_status)
+    def display_status(cached_value_ok=false)
+        InfoRequest.get_status_description(self.calculate_status(cached_value_ok))
     end
 
     # Completely delete this request and all objects depending on it
diff --git a/app/views/request/_request_listing_via_event.rhtml b/app/views/request/_request_listing_via_event.rhtml
index e3abfe393..ee1cc079a 100644
--- a/app/views/request/_request_listing_via_event.rhtml
+++ b/app/views/request/_request_listing_via_event.rhtml
@@ -17,13 +17,13 @@ end %>
       </span>
       <div class="requester">
         <% if event.event_type == 'sent' %>
-            <%= _('Request sent to {{public_body_name}} by {{info_request_user}} on {{date}}.',:public_body_name=>public_body_link_absolute(info_request.public_body),:info_request_user=>request_user_link_absolute(info_request),:date=>simple_date(event.created_at )) %> 
+            <%= _('Request sent to {{public_body_name}} by {{info_request_user}} on {{date}}.',:public_body_name=>public_body_link_absolute(info_request.public_body),:info_request_user=>request_user_link_absolute(info_request),:date=>simple_date(event.created_at )) %>
         <% elsif event.event_type == 'followup_sent' %>
             <%=event.display_status %>
-            <%= _('sent to {{public_body_name}} by {{info_request_user}} on {{date}}.',:public_body_name=>public_body_link_absolute(info_request.public_body),:info_request_user=>request_user_link_absolute(info_request),:date=>simple_date(event.created_at )) %> 
+            <%= _('sent to {{public_body_name}} by {{info_request_user}} on {{date}}.',:public_body_name=>public_body_link_absolute(info_request.public_body),:info_request_user=>request_user_link_absolute(info_request),:date=>simple_date(event.created_at )) %>
         <% elsif event.event_type == 'response' %>
             <%=event.display_status %>
-            <%= _('by {{public_body_name}} to {{info_request_user}} on {{date}}.',:public_body_name=>public_body_link_absolute(info_request.public_body),:info_request_user=>request_user_link_absolute(info_request),:date=>simple_date(event.created_at )) %> 
+            <%= _('by {{public_body_name}} to {{info_request_user}} on {{date}}.',:public_body_name=>public_body_link_absolute(info_request.public_body),:info_request_user=>request_user_link_absolute(info_request),:date=>simple_date(event.created_at )) %>
         <% elsif event.event_type == 'comment' %>
             <%= _('Request to {{public_body_name}} by {{info_request_user}}. Annotated by {{event_comment_user}} on {{date}}.',:public_body_name=>public_body_link_absolute(info_request.public_body),:info_request_user=>user_link_absolute(info_request.user),:event_comment_user=>user_link_absolute(event.comment.user),:date=>simple_date(event.created_at)) %>
         <% else %>
@@ -35,12 +35,12 @@ end %>
       </div>
       <span class="bottomline icon_<%= info_request.calculate_status %>">
         <strong>
-        <%= info_request.display_status %>
+        <%= info_request.display_status(cached_value_ok=true) %>
         </strong><br>
       </span>
   </div>
   <div class="request_right">
-    <span class="desc">	
+    <span class="desc">
         <%= highlight_and_excerpt(event.search_text_main(true), @highlight_words, 150) %>
     </span>
   </div>