From 332c92ead825503c0540f805a0fdb39c64212c15 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Fri, 26 Apr 2019 13:41:36 +0100
Subject: If report hidden, also purge update photos cache.

---
 perllib/FixMyStreet/App/Controller/Moderate.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perllib/FixMyStreet/App/Controller/Moderate.pm')

diff --git a/perllib/FixMyStreet/App/Controller/Moderate.pm b/perllib/FixMyStreet/App/Controller/Moderate.pm
index 22869d531..f71698e84 100644
--- a/perllib/FixMyStreet/App/Controller/Moderate.pm
+++ b/perllib/FixMyStreet/App/Controller/Moderate.pm
@@ -214,7 +214,7 @@ sub report_moderate_hide : Private {
     if ($c->get_param('problem_hide')) {
 
         $problem->update({ state => 'hidden' });
-        $problem->get_photoset->delete_cached;
+        $problem->get_photoset->delete_cached(plus_updates => 1);
 
         $c->res->redirect( '/' ); # Go directly to front-page
         $c->detach( 'report_moderate_audit', ['hide'] ); # break chain here.
-- 
cgit v1.2.3


From 66f0cf322750d695b7c4e55565cfabb905e75a54 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 6 Nov 2019 19:38:33 +0000
Subject: Factor out admin reports code to own controller.

---
 perllib/FixMyStreet/App/Controller/Moderate.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'perllib/FixMyStreet/App/Controller/Moderate.pm')

diff --git a/perllib/FixMyStreet/App/Controller/Moderate.pm b/perllib/FixMyStreet/App/Controller/Moderate.pm
index f71698e84..8a9f3b5a2 100644
--- a/perllib/FixMyStreet/App/Controller/Moderate.pm
+++ b/perllib/FixMyStreet/App/Controller/Moderate.pm
@@ -298,7 +298,7 @@ sub moderate_location : Private {
 
     my $problem = $c->stash->{problem};
 
-    my $moved = $c->forward('/admin/report_edit_location', [ $problem ]);
+    my $moved = $c->forward('/admin/reports/edit_location', [ $problem ]);
     if (!$moved) {
         # New lat/lon isn't valid, show an error
         $c->stash->{moderate_errors} ||= [];
@@ -315,11 +315,11 @@ sub moderate_category : Private {
     return unless $c->get_param('category');
 
     # The admin category editing needs to know all the categories etc
-    $c->forward('/admin/categories_for_point');
+    $c->forward('/admin/reports/categories_for_point');
 
     my $problem = $c->stash->{problem};
 
-    my $changed = $c->forward( '/admin/report_edit_category', [ $problem, 1 ] );
+    my $changed = $c->forward( '/admin/reports/edit_category', [ $problem, 1 ] );
     # It might need to set_report_extras in future
     if ($changed) {
         return 'category';
-- 
cgit v1.2.3


From 5b3731b263864722f26c4ab9ce28209b089a6942 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 18 Nov 2019 14:05:56 +0000
Subject: Remove cached photos before updating db field.

If the photo field is updated first, then the cache removal
doesn't think there are any photos to remove.
---
 perllib/FixMyStreet/App/Controller/Moderate.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perllib/FixMyStreet/App/Controller/Moderate.pm')

diff --git a/perllib/FixMyStreet/App/Controller/Moderate.pm b/perllib/FixMyStreet/App/Controller/Moderate.pm
index 8a9f3b5a2..f4143f0b4 100644
--- a/perllib/FixMyStreet/App/Controller/Moderate.pm
+++ b/perllib/FixMyStreet/App/Controller/Moderate.pm
@@ -263,8 +263,8 @@ sub moderate_boolean : Private {
 
     if ($new != $old) {
         if ($thing eq 'photo') {
-            $object->$thing($new ? $original : undef);
             $object->get_photoset->delete_cached;
+            $object->$thing($new ? $original : undef);
         } else {
             $object->$thing($new);
         }
-- 
cgit v1.2.3