aboutsummaryrefslogtreecommitdiffstats
path: root/perllib/FixMyStreet/App
diff options
context:
space:
mode:
authorMatthew Somerville <matthew-github@dracos.co.uk>2016-04-20 17:16:11 +0100
committerMatthew Somerville <matthew-github@dracos.co.uk>2016-04-20 17:16:11 +0100
commitd13b9e355462559bc7a1ffe70ae353a1dafd0c8e (patch)
tree2a7f42e1e782c95fc948a6198a331379d2282378 /perllib/FixMyStreet/App
parent193697bde57ef2cfd0a46bb5a85fa98727378297 (diff)
If admin removes all images, set db field to null.
Diffstat (limited to 'perllib/FixMyStreet/App')
-rw-r--r--perllib/FixMyStreet/App/Model/PhotoSet.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/perllib/FixMyStreet/App/Model/PhotoSet.pm b/perllib/FixMyStreet/App/Model/PhotoSet.pm
index 41d02d2a7..b783a20e6 100644
--- a/perllib/FixMyStreet/App/Model/PhotoSet.pm
+++ b/perllib/FixMyStreet/App/Model/PhotoSet.pm
@@ -265,13 +265,15 @@ sub remove_images {
--$dec;
}
+ $self->delete_cached();
+
+ return undef if !@images;
+
my $new_set = (ref $self)->new({
data_items => \@images,
object => $self->object,
});
- $self->delete_cached();
-
return $new_set->data; # e.g. new comma-separated fileid
}