diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-06-20 10:59:54 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-06-20 10:59:54 +0100 |
| commit | 7d0fea4b38c214a67b2fc4b56aa670e02a3cda61 (patch) | |
| tree | 85e77cf7ba0656efbacf1497baff2ef96887bd3b /app/models/info_request.rb | |
| parent | 6ef57090e436e01bc5de801bc7acb6bfadb5c490 (diff) | |
| parent | 6c4c822ef7a4491bf821326af779e5be9118c0a1 (diff) | |
Merge branch 'master' into develop
Diffstat (limited to 'app/models/info_request.rb')
| -rw-r--r-- | app/models/info_request.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb index b02be7ce9..3a571daae 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -516,7 +516,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 @@ -529,7 +529,7 @@ public self.calculate_event_states if self.requires_admin? - RequestMailer.deliver_requires_admin(self) + RequestMailer.deliver_requires_admin(self, set_by) end end |