aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/info_request.rb
diff options
context:
space:
mode:
authorMatthew Landauer <matthew@openaustralia.org>2013-02-28 15:08:36 +1100
committerMatthew Landauer <matthew@openaustralia.org>2013-03-02 14:49:14 +1100
commitd9fd0afaca38c0818ebd1221bd4843014ad6992c (patch)
tree390ed326b0843a36d6e603b1f09ab7de829ccc3a /app/models/info_request.rb
parentfef3e4ead66b49fa714cb2640998b3146c290ccd (diff)
When setting a state optionally pass a messsage
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 c663f6152..191f10018 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -548,7 +548,7 @@ public
end
# change status, including for last event for later historical purposes
- def set_described_state(new_state, set_by = nil)
+ def set_described_state(new_state, set_by = nil, message = "")
ActiveRecord::Base.transaction do
self.awaiting_description = false
last_event = self.info_request_events.last
@@ -563,7 +563,7 @@ public
if self.requires_admin?
# Check there is someone to send the message "from"
if !set_by.nil? || !self.user.nil?
- RequestMailer.deliver_requires_admin(self, set_by)
+ RequestMailer.deliver_requires_admin(self, set_by, message)
end
end
end