diff options
| -rw-r--r-- | app/models/info_request.rb | 4 | ||||
| -rw-r--r-- | app/models/outgoing_message.rb | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 3451c0b71..01d5f5c52 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -804,7 +804,9 @@ public # Text from the the initial request, for use in summary display def initial_request_text - outgoing_messages.first.try(:get_text_for_indexing) or '' + return '' if outgoing_messages.empty? + body_opts = { :censor_rules => applicable_censor_rules } + outgoing_messages.first.try(:get_text_for_indexing, true, body_opts) or '' end # Returns index of last event which is described or nil if none described. diff --git a/app/models/outgoing_message.rb b/app/models/outgoing_message.rb index 3448009bd..4f6318b3d 100644 --- a/app/models/outgoing_message.rb +++ b/app/models/outgoing_message.rb @@ -233,8 +233,12 @@ class OutgoingMessage < ActiveRecord::Base end # Returns text for indexing / text display - def get_text_for_indexing(strip_salutation = true) - text = body.strip + def get_text_for_indexing(strip_salutation = true, opts = {}) + if opts.empty? + text = body.strip + else + text = body(opts).strip + end # Remove salutation text.sub!(/Dear .+,/, "") if strip_salutation |