aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/info_request.rb
diff options
context:
space:
mode:
authorSeb Bacon <seb.bacon@gmail.com>2012-06-12 09:55:16 +0100
committerSeb Bacon <seb.bacon@gmail.com>2012-06-12 09:55:16 +0100
commitf560987ab0d3ea3471837a2b30d30c7101dc5616 (patch)
treec27a235cbafc540e887f3d98feadf8c8fe4a0026 /app/models/info_request.rb
parent4a4367ba4ec43aea7a0eb19c4a06bb004abd01eb (diff)
Make emails requesting admin attention appear to come from the user who requested the attention, not the user who made the original request.
Diffstat (limited to 'app/models/info_request.rb')
-rw-r--r--app/models/info_request.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index 095a1b1af..45819bfe7 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -519,7 +519,7 @@ public
end
# change status, including for last event for later historical purposes
- def set_described_state(new_state)
+ def set_described_state(new_state, set_by = nil)
ActiveRecord::Base.transaction do
self.awaiting_description = false
last_event = self.get_last_event
@@ -532,7 +532,7 @@ public
self.calculate_event_states
if self.requires_admin?
- RequestMailer.deliver_requires_admin(self)
+ RequestMailer.deliver_requires_admin(self, set_by)
end
end