aboutsummaryrefslogtreecommitdiffstats
path: root/perllib/FixMyStreet
diff options
context:
space:
mode:
Diffstat (limited to 'perllib/FixMyStreet')
-rw-r--r--perllib/FixMyStreet/App/Controller/Report.pm2
-rw-r--r--perllib/FixMyStreet/Cobrand/Bromley.pm10
-rw-r--r--perllib/FixMyStreet/Map/Bromley.pm3
3 files changed, 12 insertions, 3 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index 3f79a99f7..799985f8e 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -402,7 +402,7 @@ sub inspect : Private {
if ( $problem->state eq 'duplicate') {
if (my $duplicate_of = $c->get_param('duplicate_of')) {
$problem->set_duplicate_of($duplicate_of);
- } elsif (not $c->get_param('public_update')) {
+ } elsif (not $c->get_param('include_update')) {
$valid = 0;
push @{ $c->stash->{errors} }, _('Please provide a duplicate ID or public update for this report.');
}
diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index c52e871e3..5d14d0b01 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -114,11 +114,19 @@ sub open311_config {
my ($self, $row, $h, $params) = @_;
my $extra = $row->get_extra_fields;
+ my $title = $row->title;
+
+ foreach (@$extra) {
+ $title .= ' | ID: ' . $_->{value} if $_->{name} eq 'feature_id';
+ $title .= ' | PROW ID: ' . $_->{value} if $_->{name} eq 'prow_reference';
+ }
+ @$extra = grep { $_->{name} !~ /feature_id|prow_reference/ } @$extra;
+
push @$extra,
{ name => 'report_url',
value => $h->{url} },
{ name => 'report_title',
- value => $row->title },
+ value => $title },
{ name => 'public_anonymity_required',
value => $row->anonymous ? 'TRUE' : 'FALSE' },
{ name => 'email_alerts_requested',
diff --git a/perllib/FixMyStreet/Map/Bromley.pm b/perllib/FixMyStreet/Map/Bromley.pm
index 1310c2a5a..22e4147f6 100644
--- a/perllib/FixMyStreet/Map/Bromley.pm
+++ b/perllib/FixMyStreet/Map/Bromley.pm
@@ -10,10 +10,11 @@ use base 'FixMyStreet::Map::FMS';
use strict;
sub map_javascript { [
- '/vendor/OpenLayers/OpenLayers.fixmystreet.js',
+ '/vendor/OpenLayers/OpenLayers.buckinghamshire.js',
'/js/map-OpenLayers.js',
'/js/map-bing-ol.js',
'/js/map-fms.js',
+ '/cobrands/fixmystreet/assets.js',
'/cobrands/bromley/map.js',
] }