From 074b161226498c51eacc1be7662672ff9361cf51 Mon Sep 17 00:00:00 2001
From: Petter Reinholdtsen <pere@hungry.com>
Date: Sat, 23 Jul 2011 10:12:50 +0200
Subject: Make sure to set the name_sep when changing quite_char, to get Admin
 pages working with the Catalyst packages in Debian/Squeeze.  Without this,
 the generated SQL contain "foo.bar" instead of "foo"."bar", and only the
 latter work.

---
 perllib/FixMyStreet/App/Controller/Admin.pm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'perllib/FixMyStreet/App/Controller/Admin.pm')

diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index fbd50a973..3f2b62f6f 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -121,6 +121,7 @@ sub timeline : Path( 'timeline' ) : Args(0) {
     my %time;
 
     $c->model('DB')->schema->storage->sql_maker->quote_char( '"' );
+    $c->model('DB')->schema->storage->sql_maker->name_sep( '.' );
 
     my $probs = $c->cobrand->problems->timeline;
 
@@ -427,6 +428,7 @@ sub search_reports : Path('search_reports') {
         # makes PostgreSQL unhappy elsewhere so we only want to do
         # it for this query and then switch it off afterwards.
         $c->model('DB')->schema->storage->sql_maker->quote_char( '"' );
+        $c->model('DB')->schema->storage->sql_maker->name_sep( '.' );
 
         my $problems = $c->cobrand->problems->search(
             {
-- 
cgit v1.2.3


From 3c9c0531e5332c5375f23e9b37fdeb8e5212f019 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Mon, 1 Aug 2011 14:32:35 +0100
Subject: Store confirmed time if done via admin interface, fixes #141.

---
 perllib/FixMyStreet/App/Controller/Admin.pm | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'perllib/FixMyStreet/App/Controller/Admin.pm')

diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index 3f2b62f6f..a0d3e8643 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -746,6 +746,10 @@ sub update_edit : Path('update_edit') : Args(1) {
             $update->user($user);
         }
 
+        if ( $new_state eq 'confirmed' and $old_state eq 'unconfirmed' ) {
+            $update->confirmed( \'ms_current_timestamp()' );
+        }
+
         $update->update;
 
         $status_message = '<p><em>' . _('Updated!') . '</em></p>';
-- 
cgit v1.2.3