diff options
| author | Matthew Somerville <matthew@dracos.co.uk> | 2011-02-10 12:14:34 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@dracos.co.uk> | 2011-02-10 12:14:34 +0000 |
| commit | 03de34f37ee2f72a79a71c81c9220b3affb4486f (patch) | |
| tree | c6419782fb7c22067ce7ed1c15f6ea579f291b72 | |
| parent | d268531eb127f2a0767cadc5cc0fdaa40d4dfe30 (diff) | |
| parent | b478998608aebeb502a2753c82d2d00ade5a392f (diff) | |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet
| -rw-r--r-- | perllib/FixMyStreet/Alert.pm | 7 | ||||
| -rw-r--r-- | templates/emails/alert-update | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/perllib/FixMyStreet/Alert.pm b/perllib/FixMyStreet/Alert.pm index 9996f03c8..b9c124741 100644 --- a/perllib/FixMyStreet/Alert.pm +++ b/perllib/FixMyStreet/Alert.pm @@ -135,6 +135,13 @@ sub email_alerts ($) { # more than once if there are multiple vhosts running off the same database. The email_host # call checks if this is the host that sends mail for this cobrand. next unless (Cobrand::email_host($row->{alert_cobrand})); + + # create problem status message for the templates + $data{state_message} = + $row->{state} eq 'fixed' + ? _("This report is currently marked as fixed.") + : _("This report is currently marked as open."); + dbh()->do('insert into alert_sent (alert_id, parameter) values (?,?)', {}, $row->{alert_id}, $row->{item_id}); if ($last_alert_id && $last_alert_id != $row->{alert_id}) { _send_aggregated_alert_email(%data); diff --git a/templates/emails/alert-update b/templates/emails/alert-update index f68ee55a4..ac0ddd50a 100644 --- a/templates/emails/alert-update +++ b/templates/emails/alert-update @@ -4,6 +4,8 @@ The following updates have been left on this problem: <?=$values['data']?> +<?=$values['state_message']?> + To view or reply to these updates, please visit the following URL: <?=$values['problem_url']?> |