diff options
| author | Dave Whiteland <dave@mysociety.org> | 2012-10-03 17:47:25 +0100 |
|---|---|---|
| committer | Dave Whiteland <dave@mysociety.org> | 2012-10-03 17:47:25 +0100 |
| commit | 272dba7ce6d59d81b52579dd4c5fc7d65e9bec20 (patch) | |
| tree | cabbefec7823061781050ffb002a38ce53d68f56 /perllib/FixMyStreet/App/Controller/Around.pm | |
| parent | 39c1b648b30e67ceb8912a35b386eb4ee23857b8 (diff) | |
| parent | f16a3e96b65394089d10c46c1d67cf82c67e72dd (diff) | |
Merge branch 'fmb-read-only'
Conflicts:
db/schema.sql
perllib/FixMyStreet/DB/Result/Contact.pm
perllib/FixMyStreet/DB/Result/Problem.pm
Diffstat (limited to 'perllib/FixMyStreet/App/Controller/Around.pm')
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Around.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Around.pm b/perllib/FixMyStreet/App/Controller/Around.pm index 3047b195c..f2bb23350 100644 --- a/perllib/FixMyStreet/App/Controller/Around.pm +++ b/perllib/FixMyStreet/App/Controller/Around.pm @@ -45,7 +45,7 @@ sub around_index : Path : Args(0) { || $c->forward('/location/determine_location_from_pc'); # Check to see if the spot is covered by a council - if not show an error. - return unless $c->forward('check_location_is_acceptable'); + return unless $c->cobrand->moniker eq 'fixmybarangay' || $c->forward('check_location_is_acceptable'); # If we have a partial - redirect to /report/new so that it can be # completed. @@ -204,6 +204,7 @@ sub display_location : Private { longitude => $short_longitude, clickable => 1, pins => \@pins, + area => $c->cobrand->areas_on_around, ); return 1; |