few more static states

mysociety · Aug 18, 2011 · 34ae11b · 34ae11b
1 parent d4d82d6
commit 34ae11b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/perllib/FixMyStreet/App/Controller/Questionnaire.pm b/perllib/FixMyStreet/App/Controller/Questionnaire.pm
@@ -245,7 +245,7 @@ sub process_questionnaire : Private {
         if ($c->stash->{been_fixed} eq 'No' || $c->stash->{been_fixed} eq 'Unknown') && !$c->stash->{another};
 
     push @errors, _('Please provide some explanation as to why you\'re reopening this report')
-        if $c->stash->{been_fixed} eq 'No' && $c->stash->{problem}->state eq 'fixed' && !$c->stash->{update};
+        if $c->stash->{been_fixed} eq 'No' && $c->stash->{problem}->is_fixed() && !$c->stash->{update};
 
     $c->forward('/report/new/process_photo');
     push @errors, $c->stash->{photo_error}

diff --git a/perllib/FixMyStreet/DB/Result/User.pm b/perllib/FixMyStreet/DB/Result/User.pm
@@ -165,7 +165,7 @@ sub belongs_to_council {
     my $self = shift;
     my $council = shift;
 
-    my %councils = map { $_ => 1 } split '\|', $council;
+    my %councils = map { $_ => 1 } split ',', $council;
 
     return 1 if $self->from_council && $councils{ $self->from_council };
 

diff --git a/templates/web/default/around/around_map_list_items.html b/templates/web/default/around/around_map_list_items.html
@@ -6,7 +6,7 @@
         <li>
             <a href="[% c.uri_for('/report', p.problem.id ) %]">[% p.problem.title | html %]</a>
             <small>[% prettify_epoch( p.problem.confirmed_local.epoch, 1 ) %], [% dist %]km</small>
-            [% IF p.problem.state == 'fixed' %]
+            [% IF p.problem.is_fixed %]
                 <small>[% loc('(fixed)') %]</small>
             [% END %]
         </li>

diff --git a/templates/web/default/around/on_map_list_items.html b/templates/web/default/around/on_map_list_items.html
@@ -3,7 +3,7 @@
         <li>
             <a href="[% c.uri_for('/report', p.id ) %]">[% p.title | html %]</a>
             <small>[% prettify_epoch( p.confirmed_local.epoch, 1 ) %]</small>
-            [% IF p.state == 'fixed' %]
+            [% IF p.is_fixed %]
                 <small>[% loc('(fixed)') %]</small>
             [% END %]
         </li>