diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/general_controller.rb | 4 | ||||
| -rw-r--r-- | app/models/info_request_event.rb | 19 | ||||
| -rw-r--r-- | app/views/request/_correspondence.rhtml | 4 |
3 files changed, 20 insertions, 7 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index 9b9e311e7..7dbfa6b53 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -5,7 +5,7 @@ # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: general_controller.rb,v 1.17 2008-04-01 16:40:37 francis Exp $ +# $Id: general_controller.rb,v 1.18 2008-04-15 23:53:10 francis Exp $ class GeneralController < ApplicationController @@ -56,6 +56,8 @@ class GeneralController < ApplicationController query = params[:query] sortby = params[:sortby] perform_search(query, sortby) + + #render :controller => "help", :action => "about" end # For debugging diff --git a/app/models/info_request_event.rb b/app/models/info_request_event.rb index 6e8ce0231..f7897ed9d 100644 --- a/app/models/info_request_event.rb +++ b/app/models/info_request_event.rb @@ -18,13 +18,14 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: info_request_event.rb,v 1.35 2008-04-09 16:53:59 francis Exp $ +# $Id: info_request_event.rb,v 1.36 2008-04-15 23:53:10 francis Exp $ class InfoRequestEvent < ActiveRecord::Base belongs_to :info_request validates_presence_of :info_request - belongs_to :info_request_event_id + belongs_to :outgoing_message + belongs_to :incoming_message validates_presence_of :event_type validates_inclusion_of :event_type, :in => [ @@ -105,6 +106,14 @@ class InfoRequestEvent < ActiveRecord::Base # We store YAML version of parameters in the database def params=(params) + # XXX should really set these explicitly, and stop storing them in + # here, but keep it for compatibility with old way for now + if not params[:incoming_message_id].nil? + self.incoming_message_id = params[:incoming_message_id] + end + if not params[:outgoing_message_id].nil? + self.outgoing_message_id = params[:outgoing_message_id] + end self.params_yaml = params.to_yaml end def params @@ -113,7 +122,8 @@ class InfoRequestEvent < ActiveRecord::Base # Find related incoming message # XXX search for the find below and call this function more instead - def incoming_message + # XXX deprecated, remove it + def incoming_message_via_params if not ['response'].include?(self.event_type) return nil end @@ -127,7 +137,8 @@ class InfoRequestEvent < ActiveRecord::Base # Find related outgoing message # XXX search for the find below and call this function more instead - def outgoing_message + # XXX deprecated, remove it + def outgoing_message_via_params if not [ 'edit_outgoing', 'sent', 'resent', 'followup_sent' ].include?(self.event_type) return nil end diff --git a/app/views/request/_correspondence.rhtml b/app/views/request/_correspondence.rhtml index 8f91631f2..cf7864041 100644 --- a/app/views/request/_correspondence.rhtml +++ b/app/views/request/_correspondence.rhtml @@ -1,7 +1,7 @@ <% @last_email = nil if !info_request_event.nil? && info_request_event.event_type == 'response' - incoming_message = IncomingMessage.find(info_request_event.params[:incoming_message_id]) + incoming_message = info_request_event.incoming_message end if not incoming_message.nil? @@ -25,7 +25,7 @@ if not incoming_message.nil? </div> <% elsif info_request_event.event_type == 'sent' || info_request_event.event_type == 'followup_sent' - outgoing_message = OutgoingMessage.find(info_request_event.params[:outgoing_message_id]) + outgoing_message = info_request_event.outgoing_message %> <div class="correspondence" id="outgoing-<%=outgoing_message.id.to_s%>"> <% if @previous_date.nil? or (@previous_date != info_request_event.created_at.to_date) %> |