diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2013-02-11 11:55:06 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2013-02-11 11:55:06 +0000 |
| commit | 7098d9d2f00a8e851d72d68af8248948caa09315 (patch) | |
| tree | 153285e258910fdcbaeec2e684b4a105960c16d6 | |
| parent | 5b2e18389734751165d2eeb21a3b3f2e8d2e8755 (diff) | |
Couple of Bromley council references missed in merge.
| -rw-r--r-- | perllib/FixMyStreet/App/View/Web.pm | 1 | ||||
| -rw-r--r-- | templates/web/default/report/updates.html | 2 | ||||
| -rw-r--r-- | templates/web/fixmystreet/report/banner.html | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/perllib/FixMyStreet/App/View/Web.pm b/perllib/FixMyStreet/App/View/Web.pm index febeaf3c1..2f3ec8914 100644 --- a/perllib/FixMyStreet/App/View/Web.pm +++ b/perllib/FixMyStreet/App/View/Web.pm @@ -122,6 +122,7 @@ sub add_links { $text =~ s/\r//g; $text = ent($text); $text =~ s{(https?://[^\s]+)}{<a href="$1">$1</a>}g; + $text =~ s{">(.*?)<}{">$1<}ge; return $text; } diff --git a/templates/web/default/report/updates.html b/templates/web/default/report/updates.html index 04a8bec33..c2aad42f9 100644 --- a/templates/web/default/report/updates.html +++ b/templates/web/default/report/updates.html @@ -28,7 +28,7 @@ [%- IF update.mark_open %][% update_state = ", " _ loc( 'reopened' ) %][% END %] [%- IF !update_state && update.problem_state %] [%- state = update.meta_problem_state %] - [%- IF ( c.cobrand.moniker == 'bromley' OR update.user.council == 'Bromley Council' ) AND update.problem_state == 'unable to fix' %] + [%- IF ( c.cobrand.moniker == 'bromley' OR update.user.body == 'Bromley Council' ) AND update.problem_state == 'unable to fix' %] [%- state = loc('no further action') %] [% END %] [%- IF update.problem_state == 'confirmed' AND global.last_state != '' %] diff --git a/templates/web/fixmystreet/report/banner.html b/templates/web/fixmystreet/report/banner.html index 25c9db424..307a6f7ae 100644 --- a/templates/web/fixmystreet/report/banner.html +++ b/templates/web/fixmystreet/report/banner.html @@ -5,7 +5,7 @@ </div> [% END %] -[% IF c.cobrand.moniker != 'bromley' AND problem.council != '2482' AND problem.is_open AND date.now - problem.lastupdate_local.epoch > 8 * 7 * 24 * 60 * 60 %] +[% IF c.cobrand.moniker != 'bromley' AND problem.bodies_str != '2482' AND problem.is_open AND date.now - problem.lastupdate_local.epoch > 8 * 7 * 24 * 60 * 60 %] [% INCLUDE banner, id = 'unknown', text = loc('Unknown') %] [% END %] [% IF problem.is_fixed %] |