Sign up new report to email alert if logged in as well as when confirmed by email. Allow disabling rather than deleting of alerts. Revert quoting as it breaks timestamps and literal SQL.

1 files changed, 10 insertions, 2 deletions

diff --git a/perllib/FixMyStreet/DB/Result/Alert.pm b/perllib/FixMyStreet/DB/Result/Alert.pm
index b99c83a45..53cb96ff4 100644
--- a/perllib/FixMyStreet/DB/Result/Alert.pm
+++ b/perllib/FixMyStreet/DB/Result/Alert.pm
@@ -85,10 +85,18 @@ Sets the state of the alert to confirmed.
 sub confirm {
     my $self = shift;
 
-    return if $self->confirmed and $self->confirmed == 1 and $self->whendisabled ne 'null';
-
     $self->confirmed(1);
     $self->whendisabled(undef);
+    $self->update;
+
+    return 1;
+}
+
+sub disable {
+    my $self = shift;
+
+    $self->whendisabled( \'ms_current_timestamp()' );
+    $self->update;
 
     return 1;
 }