diff options
author | Struan Donald <struan@exo.org.uk> | 2018-02-14 17:40:56 +1300 |
---|---|---|
committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2018-03-15 13:18:11 +0000 |
commit | 4e31d58ac2ac23228d2d6c561901547d20f57ffb (patch) | |
tree | df228c7cbe9e86ee37dbb2f2657b92df198bb362 /perllib/FixMyStreet | |
parent | f1c8da3ed21adc1c64e8276edc116af200b8883f (diff) |
send multiple photos over open311
Per cobrand configurable option to send multiple photos over open311
instead of just a single one. Does this by sending multiple media_url
parameters in the POST body.
The default remains to send the first photo associated with a report.
Diffstat (limited to 'perllib/FixMyStreet')
-rw-r--r-- | perllib/FixMyStreet/Cobrand/Rutland.pm | 2 | ||||
-rw-r--r-- | perllib/FixMyStreet/Script/Reports.pm | 2 | ||||
-rw-r--r-- | perllib/FixMyStreet/SendReport/Open311.pm | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/perllib/FixMyStreet/Cobrand/Rutland.pm b/perllib/FixMyStreet/Cobrand/Rutland.pm index 087744cd7..c0f9dd197 100644 --- a/perllib/FixMyStreet/Cobrand/Rutland.pm +++ b/perllib/FixMyStreet/Cobrand/Rutland.pm @@ -21,6 +21,8 @@ sub open311_config { push @$extra, { name => 'closest_address', value => $h->{closest_address} } } $row->set_extra_fields( @$extra ); + + $params->{multi_photos} = 1; } sub example_places { diff --git a/perllib/FixMyStreet/Script/Reports.pm b/perllib/FixMyStreet/Script/Reports.pm index aa6b64752..b8c3d6d0d 100644 --- a/perllib/FixMyStreet/Script/Reports.pm +++ b/perllib/FixMyStreet/Script/Reports.pm @@ -88,6 +88,8 @@ sub send(;$) { if ($row->photo) { $h{has_photo} = _("This web page also contains a photo of the problem, provided by the user.") . "\n\n"; $h{image_url} = $email_base_url . $row->photos->[0]->{url_full}; + my @all_images = map { $email_base_url . $_->{url_full} } @{ $row->photos }; + $h{all_image_urls} = \@all_images; } else { $h{has_photo} = ''; $h{image_url} = ''; diff --git a/perllib/FixMyStreet/SendReport/Open311.pm b/perllib/FixMyStreet/SendReport/Open311.pm index ecda0bca1..98637dd1f 100644 --- a/perllib/FixMyStreet/SendReport/Open311.pm +++ b/perllib/FixMyStreet/SendReport/Open311.pm @@ -28,6 +28,7 @@ sub send { send_notpinpointed => 0, use_service_as_deviceid => 0, extended_description => 1, + multi_photos => 0, ); my $cobrand = $body->get_cobrand_handler || $row->get_cobrand_logged; |