diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2012-03-14 13:11:55 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2012-03-14 13:11:55 +0000 |
| commit | f465e32109d6600887f1c5765b44347a4cfaa3d7 (patch) | |
| tree | 3855e96d1d69683b388d82c27bad3f9e339f2792 /perllib/FixMyStreet/App/Controller/Admin.pm | |
| parent | 1b15ca0aea334d20fb0f19fed36bc948668e2a14 (diff) | |
| parent | c9681f6bbc04659b9d6ed5eaa46b8c2edd704f9e (diff) | |
Merge branch 'redesign'
Conflicts:
.gitignore
notes/INSTALL
perllib/FixMyStreet/App/Controller/Photo.pm
perllib/FixMyStreet/Cobrand/FixMyStreet.pm
Diffstat (limited to 'perllib/FixMyStreet/App/Controller/Admin.pm')
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Admin.pm | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index 0e34ea64b..83f77f401 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -627,10 +627,6 @@ sub report_edit : Path('report_edit') : Args(1) { $problem->photo(undef); } - if ( $new_state ne $old_state ) { - $problem->lastupdate( \'ms_current_timestamp()' ); - } - if ( $new_state eq 'confirmed' and $old_state eq 'unconfirmed' ) { $problem->confirmed( \'ms_current_timestamp()' ); } @@ -639,6 +635,7 @@ sub report_edit : Path('report_edit') : Args(1) { $problem->discard_changes; } else { + $problem->lastupdate( \'ms_current_timestamp()' ) if $edited || $new_state ne $old_state; $problem->update; if ( $new_state ne $old_state ) { |