diff options
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Contact.pm | 15 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/Bromley.pm | 2 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/Default.pm | 2 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/FixMyStreet.pm | 4 |
4 files changed, 15 insertions, 8 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Contact.pm b/perllib/FixMyStreet/App/Controller/Contact.pm index 91580f05a..c300aee9a 100644 --- a/perllib/FixMyStreet/App/Controller/Contact.pm +++ b/perllib/FixMyStreet/App/Controller/Contact.pm @@ -139,17 +139,17 @@ sub prepare_params_for_email : Private { $c->stash->{message} =~ s/\r\n/\n/g; $c->stash->{subject} =~ s/\r|\n/ /g; - my $base_url = $c->cobrand->base_url_for_emails( $c->cobrand->extra_data ); - my $admin_base_url = $c->cobrand->admin_base_url - || 'https://secure.mysociety.org/admin/bci/'; + my $base_url = $c->cobrand->base_url_for_emails( $c->cobrand->extra_data ); + my $admin_url = $c->cobrand->admin_base_url; if ( $c->stash->{update} ) { my $problem_url = $base_url . '/report/' . $c->stash->{update}->problem_id . '#update_' . $c->stash->{update}->id; - my $admin_url = $admin_base_url . 'update_edit/' . $c->stash->{update}->id; + my $admin_url = " - $admin_url" . 'update_edit/' . $c->stash->{update}->id + if $admin_url; $c->stash->{message} .= sprintf( - " \n\n[ Complaint about update %d on report %d - %s - %s ]", + " \n\n[ Complaint about update %d on report %d - %s%s ]", $c->stash->{update}->id, $c->stash->{update}->problem_id, $problem_url, $admin_url @@ -158,9 +158,10 @@ sub prepare_params_for_email : Private { elsif ( $c->stash->{problem} ) { my $problem_url = $base_url . '/report/' . $c->stash->{problem}->id; - my $admin_url = $admin_base_url . 'report_edit/' . $c->stash->{problem}->id; + $admin_url = " - $admin_url" . 'report_edit/' . $c->stash->{problem}->id + if $admin_url; $c->stash->{message} .= sprintf( - " \n\n[ Complaint about report %d - %s - %s ]", + " \n\n[ Complaint about report %d - %s%s ]", $c->stash->{problem}->id, $problem_url, $admin_url ); diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm index 3147860d0..406217cfc 100644 --- a/perllib/FixMyStreet/Cobrand/Bromley.pm +++ b/perllib/FixMyStreet/Cobrand/Bromley.pm @@ -16,6 +16,8 @@ sub base_url { 'https://fix.bromley.gov.uk'; } +sub admin_base_url { '' } + sub path_to_web_templates { my $self = shift; return [ diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm index 2a49e9246..b06c534ac 100644 --- a/perllib/FixMyStreet/Cobrand/Default.pm +++ b/perllib/FixMyStreet/Cobrand/Default.pm @@ -97,7 +97,7 @@ Base URL for the admin interface. =cut -sub admin_base_url { 0 } +sub admin_base_url { '' } =head2 writetothem_url diff --git a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm index 8d6eb9ec8..c2ba60786 100644 --- a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm +++ b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm @@ -6,6 +6,10 @@ sub restriction { return {}; } +sub admin_base_url { + return 'https://secure.mysociety.org/admin/bci/'; +} + sub get_council_sender { my ( $self, $area_id, $area_info ) = @_; |