From a687b48c0ae1fe6286e5055d7c2041df191170c8 Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Wed, 29 Apr 2015 11:38:43 +0100 Subject: InfoRequest#initial_request_text minor improvement system total real old 0.810000 0.300000 1.110000 ( 1.358172) new 0.970000 0.090000 1.060000 ( 1.292340) --- app/models/info_request.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'app/models/info_request.rb') diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 0ca3a1279..3451c0b71 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -804,8 +804,7 @@ public # Text from the the initial request, for use in summary display def initial_request_text - return '' if outgoing_messages.empty? # mainly for use with incomplete fixtures - outgoing_messages.first.get_text_for_indexing + outgoing_messages.first.try(:get_text_for_indexing) or '' end # Returns index of last event which is described or nil if none described. -- cgit v1.2.3 From 9329b7f06d8a36ecb901d2172836ab8f5b2cdf3b Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Wed, 29 Apr 2015 15:09:29 +0100 Subject: InfoRequest#initial_request_text performance Passes the InfoRequest's CensorRules directly to the OutgoingMessage. user system total real old 0.010000 0.010000 0.020000 ( 0.020827) new 0.010000 0.000000 0.010000 ( 0.016633) --- app/models/info_request.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app/models/info_request.rb') 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. -- cgit v1.2.3