diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-07-27 16:07:03 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-07-27 16:07:03 +0100 |
| commit | d6044e4fdada7b6cf24a5ea640839cf708c8d782 (patch) | |
| tree | 9842c3a15d2e2a14f2fb5c53403786e9dbfd4cd5 | |
| parent | b90fa0bb3a994753276837f996e4a9c5855583cc (diff) | |
| parent | 50984fe0e0b75436ed2ce673631c018e83ed9945 (diff) | |
Merge branch 'new_statuses' of ssh://git.mysociety.org/data/git/public/fixmystreet into new_statuses
| -rwxr-xr-x | perllib/FixMyStreet/App/Controller/Questionnaire.pm | 2 | ||||
| -rw-r--r-- | templates/web/default/report/display.html | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Questionnaire.pm b/perllib/FixMyStreet/App/Controller/Questionnaire.pm index c498ec61e..d9bdb7108 100755 --- a/perllib/FixMyStreet/App/Controller/Questionnaire.pm +++ b/perllib/FixMyStreet/App/Controller/Questionnaire.pm @@ -168,7 +168,7 @@ sub submit_standard : Private { # If it's not fixed and they say it's still not been fixed, record time update if ( $c->stash->{been_fixed} eq 'No' && - FixMyStreet::DB::Result::Problem->open_states($old_state) ) { + FixMyStreet::DB::Result::Problem->open_states->{$old_state} ) { $problem->lastupdate( \'ms_current_timestamp()' ); } diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html index b3eb0d779..fe26ec60d 100644 --- a/templates/web/default/report/display.html +++ b/templates/web/default/report/display.html @@ -95,6 +95,7 @@ <option [% 'selected ' IF state.0 == problem.state %] value="[% state.0 %]">[% state.1 %]</option> [% END %] </select> + </div> [% ELSE %] [% IF problem.is_fixed AND c.user_exists AND c.user.id == problem.user_id %] <div class="checkbox"> @@ -103,7 +104,7 @@ </div> [% ELSIF !problem.is_fixed %] <div class="checkbox"> - <input type="checkbox" name="fixed" id="form_fixed" value="1"[% fixed %]> + <input type="checkbox" name="fixed" id="form_fixed" value="1"[% ' checked' IF update.mark_fixed %]> <label for="form_fixed">[% loc('This problem has been fixed') %]</label> </div> [% END %] |