3 files changed, 53 insertions, 17 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index 25fdd2db5..a1d301249 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -892,7 +892,7 @@ sub report_edit : Path('report_edit') : Args(1) {
             $self->remove_photo($c, $problem, $remove_photo_param);
         }
 
-        if ( $remove_photo_param || $problem->state eq 'hidden' ) {
+        if ($problem->state eq 'hidden') {
             $problem->get_photoset->delete_cached;
         }
 
@@ -1274,8 +1274,14 @@ sub update_edit : Path('update_edit') : Args(1) {
             $self->remove_photo($c, $update, $remove_photo_param);
         }
 
-        if ( $remove_photo_param || $new_state eq 'hidden' ) {
-            $update->get_photoset->delete_cached;
+        $c->stash->{status_message} = '<p><em>' . _('Updated!') . '</em></p>';
+
+        # Must call update->hide while it's not hidden (so is_latest works)
+        if ($new_state eq 'hidden') {
+            my $outcome = $update->hide;
+            $c->stash->{status_message} .=
+              '<p><em>' . _('Problem marked as open.') . '</em></p>'
+                if $outcome->{reopened};
         }
 
         $update->name( $c->get_param('name') || '' );
@@ -1296,19 +1302,6 @@ sub update_edit : Path('update_edit') : Args(1) {
 
         $update->update;
 
-        $c->stash->{status_message} = '<p><em>' . _('Updated!') . '</em></p>';
-
-        # If we're hiding an update, see if it marked as fixed and unfix if so
-        if ( $new_state eq 'hidden' && $update->mark_fixed ) {
-            if ( $update->problem->state =~ /^fixed/ ) {
-                $update->problem->state('confirmed');
-                $update->problem->update;
-            }
-
-            $c->stash->{status_message} .=
-              '<p><em>' . _('Problem marked as open.') . '</em></p>';
-        }
-
         if ( $new_state ne $old_state ) {
             $c->forward( 'log_edit',
                 [ $update->id, 'update', 'state_change' ] );
@@ -1432,6 +1425,8 @@ sub user_edit : Path('user_edit') : Args(1) {
         $c->forward('unban_user', [ $user ]);
     } elsif ( $c->get_param('submit') and $c->get_param('anon_everywhere') ) {
         $c->forward('user_anon_everywhere', [ $user ]);
+    } elsif ( $c->get_param('submit') and $c->get_param('hide_everywhere') ) {
+        $c->forward('user_hide_everywhere', [ $user ]);
     } elsif ( $c->get_param('submit') ) {
 
         my $edited = 0;
@@ -1768,6 +1763,20 @@ sub user_anon_everywhere : Private {
     $c->stash->{status_message} = _('That user has been made anonymous on all reports and updates.');
 }
 
+sub user_hide_everywhere : Private {
+    my ( $self, $c, $user ) = @_;
+    my $problems = $user->problems->search({ state => { '!=' => 'hidden' } });
+    while (my $problem = $problems->next) {
+        $problem->get_photoset->delete_cached;
+        $problem->update({ state => 'hidden' });
+    }
+    my $updates = $user->comments->search({ state => { '!=' => 'hidden' } });
+    while (my $update = $updates->next) {
+        $update->hide;
+    }
+    $c->stash->{status_message} = _('That user’s reports and updates have been hidden.');
+}
+
 sub unban_user : Private {
     my ( $self, $c, $user ) = @_;
 
@@ -1913,6 +1922,7 @@ sub remove_photo : Private {
     my ($self, $c, $object, $keys) = @_;
     if ($keys eq 'ALL') {
         $object->photo(undef);
+        $object->get_photoset->delete_cached;
     } else {
         my $fileids = $object->get_photoset->remove_images($keys);
         $object->photo($fileids);
diff --git a/perllib/FixMyStreet/App/Controller/Moderate.pm b/perllib/FixMyStreet/App/Controller/Moderate.pm
index a8e0b7a3c..86143b5ea 100644
--- a/perllib/FixMyStreet/App/Controller/Moderate.pm
+++ b/perllib/FixMyStreet/App/Controller/Moderate.pm
@@ -128,6 +128,7 @@ sub report_moderate_hide : Private {
     if ($c->get_param('problem_hide')) {
 
         $problem->update({ state => 'hidden' });
+        $problem->get_photoset->delete_cached;
 
         $c->res->redirect( '/' ); # Go directly to front-page
         $c->detach( 'report_moderate_audit', ['hide'] ); # break chain here.
@@ -267,7 +268,7 @@ sub update_moderate_hide : Private {
     my $comment = $c->stash->{comment} or die;
 
     if ($c->get_param('update_hide')) {
-        $comment->update({ state => 'hidden' });
+        $comment->hide;
         $c->detach( 'update_moderate_audit', ['hide'] ); # break chain here.
     }
     return;
diff --git a/perllib/FixMyStreet/DB/Result/Comment.pm b/perllib/FixMyStreet/DB/Result/Comment.pm
index 60fd31510..ce4fc216a 100644
--- a/perllib/FixMyStreet/DB/Result/Comment.pm
+++ b/perllib/FixMyStreet/DB/Result/Comment.pm
@@ -293,4 +293,29 @@ sub problem_state_display {
     return $update_state;
 }
 
+sub is_latest {
+    my $self = shift;
+    my $latest_update = $self->result_source->resultset->search(
+        { problem_id => $self->problem_id, state => 'confirmed' },
+        { order_by => [ { -desc => 'confirmed' }, { -desc => 'id' } ] }
+    )->first;
+    return $latest_update->id == $self->id;
+}
+
+sub hide {
+    my $self = shift;
+
+    my $ret = {};
+
+    # If we're hiding an update, see if it marked as fixed and unfix if so
+    if ($self->mark_fixed && $self->is_latest && $self->problem->state =~ /^fixed/) {
+        $self->problem->state('confirmed');
+        $self->problem->update;
+        $ret->{reopened} = 1;
+    }
+    $self->get_photoset->delete_cached;
+    $self->update({ state => 'hidden' });
+    return $ret;
+}
+
 1;