diff options
| author | Struan Donald <struan@exo.org.uk> | 2018-08-07 17:18:29 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2018-10-01 07:57:22 +0100 |
| commit | 1abc3183acb95f83ddbb05fb80ba19b87b047657 (patch) | |
| tree | 3ef2cc80ec89829ccfa5b486a1e6bf58929cfef2 /perllib | |
| parent | 8b9ff92dc8aa56d139a32d5a630fc13842e0e632 (diff) | |
[Oxfordshire] remove open311 hardcoding
we no longer need some of the hardcoded oxfordshire Open311 overrides so
remove them
Diffstat (limited to 'perllib')
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/Oxfordshire.pm | 5 | ||||
| -rw-r--r-- | perllib/Open311.pm | 4 | ||||
| -rw-r--r-- | perllib/Open311/GetServiceRequestUpdates.pm | 4 |
3 files changed, 1 insertions, 12 deletions
diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm index 392bf37c3..cac79a347 100644 --- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm +++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm @@ -155,11 +155,6 @@ sub open311_config { $params->{extended_description} = 'oxfordshire'; } -sub open311_pre_send { - my ($self, $row, $open311) = @_; - $open311->endpoints( { requests => 'open311_service_request.cgi' } ); -} - sub on_map_default_status { return 'open'; } sub contact_email { diff --git a/perllib/Open311.pm b/perllib/Open311.pm index a57fceeaf..c48ff2c7a 100644 --- a/perllib/Open311.pm +++ b/perllib/Open311.pm @@ -199,9 +199,7 @@ sub _generate_service_request_description { $description .= "detail: " . $problem->detail . "\n\n"; $description .= "url: " . $extra->{url} . "\n\n"; $description .= "Submitted via FixMyStreet\n"; - if ($self->extended_description ne 'oxfordshire') { - $description = "title: " . $problem->title . "\n\n$description"; - } + $description = "title: " . $problem->title . "\n\n$description"; } elsif ($problem->cobrand eq 'fixamingata') { $description .= "Titel: " . $problem->title . "\n\n"; $description .= "Beskrivning: " . $problem->detail . "\n\n"; diff --git a/perllib/Open311/GetServiceRequestUpdates.pm b/perllib/Open311/GetServiceRequestUpdates.pm index fa852a80d..bef1aca67 100644 --- a/perllib/Open311/GetServiceRequestUpdates.pm +++ b/perllib/Open311/GetServiceRequestUpdates.pm @@ -44,10 +44,6 @@ sub fetch { $endpoints->{update} = 'update.xml'; $endpoints->{service_request_updates} = 'update.xml'; $o->endpoints( $endpoints ); - } elsif ( $body->areas->{$AREA_ID_OXFORDSHIRE} ) { - my $endpoints = $o->endpoints; - $endpoints->{service_request_updates} = 'open311_service_request_update.cgi'; - $o->endpoints( $endpoints ); } $self->suppress_alerts( $body->suppress_alerts ); |