Merge remote-tracking branch 'mysociety/develop' into rails-3-develop

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/admin_request_controller.rb
	app/controllers/admin_track_controller.rb
	app/controllers/request_controller.rb
	app/controllers/services_controller.rb
	app/helpers/link_to_helper.rb
	app/mailers/request_mailer.rb
	app/models/application_mailer.rb
	app/models/info_request.rb
	app/views/admin_censor_rule/edit.html.erb
	app/views/admin_censor_rule/new.html.erb
	app/views/admin_public_body/_form.html.erb
	app/views/admin_public_body/_locale_selector.html.erb
	app/views/admin_public_body/_one_list.html.erb
	app/views/admin_public_body/edit.html.erb
	app/views/admin_public_body/list.html.erb
	app/views/admin_public_body/new.html.erb
	app/views/admin_request/_incoming_message_actions.html.erb
	app/views/admin_request/edit.html.erb
	app/views/admin_request/edit_comment.html.erb
	app/views/admin_request/edit_outgoing.html.erb
	app/views/admin_request/list.html.erb
	app/views/admin_request/list_old_unclassified.html.erb
	app/views/admin_request/show.html.erb
	app/views/admin_track/_some_tracks.html.erb
	app/views/admin_track/list.html.erb
	app/views/admin_user/edit.html.erb
	app/views/admin_user/list.html.erb
	app/views/admin_user/show.html.erb
	app/views/general/_footer.html.erb
	app/views/general/exception_caught.html.erb
	app/views/help/contact.html.erb
	app/views/layouts/default.html.erb
	app/views/public_body/_alphabet.html.erb
	app/views/request/_request_listing_single.html.erb
	app/views/request/_sidebar.html.erb
	app/views/request/new.html.erb
	app/views/request/show.html.erb
	app/views/request_mailer/external_response.rhtml
	app/views/request_mailer/fake_response.rhtml
	config/environment.rb
	config/environments/production.rb
	config/routes.rb
	spec/controllers/admin_censor_rule_controller_spec.rb
	spec/controllers/request_controller_spec.rb
	spec/controllers/track_controller_spec.rb
	spec/helpers/link_to_helper_spec.rb
	spec/mailers/request_mailer_spec.rb
	spec/models/info_request_spec.rb
	spec/spec_helper.rb
	spec/views/public_body/show.html.erb_spec.rb
	spec/views/request/show.html.erb_spec.rb
	vendor/plugins/rails_xss/lib/rails_xss/erubis.rb

1 files changed, 19 insertions, 15 deletions

diff --git a/app/models/info_request_event.rb b/app/models/info_request_event.rb
index bddd1db01..b52bb371e 100644
--- a/app/models/info_request_event.rb
+++ b/app/models/info_request_event.rb
@@ -77,17 +77,18 @@ class InfoRequestEvent < ActiveRecord::Base
     end
 
     def user_can_view?(user)
-        if !self.info_request.user_can_view?(user)
+        unless info_request.user_can_view?(user)
             raise "internal error, called user_can_view? on event when there is not permission to view entire request"
         end
 
-        if self.prominence == 'hidden'
-            return User.view_hidden_requests?(user)
-        end
-        if self.prominence == 'requester_only'
-            return self.info_request.is_owning_user?(user)
+        case prominence
+        when 'hidden'
+            User.view_hidden_requests?(user)
+        when 'requester_only'
+            info_request.is_owning_user?(user)
+        else
+            true
         end
-        return true
     end
 
 
@@ -363,16 +364,19 @@ class InfoRequestEvent < ActiveRecord::Base
     end
 
     def is_sent_sort?
-        if [ 'sent', 'resent'].include?(self.event_type)
-            return true
-        end
-        return false
+        ['sent', 'resent'].include?(event_type)
     end
+
     def is_followup_sort?
-        if [ 'followup_sent', 'followup_resent'].include?(self.event_type)
-            return true
-        end
-        return false
+        ['followup_sent', 'followup_resent'].include?(event_type)
+    end
+
+    def outgoing?
+        ['sent', 'followup_sent'].include?(event_type)
+    end
+
+    def response?
+        event_type == 'response'
     end
 
     def same_email_as_previous_send?