diff options
| author | Edmund von der Burg <evdb@mysociety.org> | 2011-04-11 11:43:13 +0100 |
|---|---|---|
| committer | Edmund von der Burg <evdb@mysociety.org> | 2011-04-11 11:43:13 +0100 |
| commit | 1c70dcf732f3b6ced75c734703ccce237cfbd3ce (patch) | |
| tree | 9ad3928d9ba84d8d8f68e7bcbc803e0e52d7d526 | |
| parent | 57677197480e18bf2c917ba9fc444797b0db8bff (diff) | |
| parent | a37eb834665ea7a88e9d900577f3189a9094dee7 (diff) | |
Merge branch 'migrate_to_catalyst' of ssh://evdb@git.mysociety.org/data/git/public/fixmystreet into migrate_to_catalyst
| -rw-r--r-- | db/schema.sql | 2 | ||||
| -rw-r--r-- | notes/INSTALL-catalyst.txt | 4 | ||||
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Report/New.pm | 7 |
3 files changed, 9 insertions, 4 deletions
diff --git a/db/schema.sql b/db/schema.sql index a44b91ca7..297a13946 100644 --- a/db/schema.sql +++ b/db/schema.sql @@ -107,7 +107,7 @@ create table contacts_history ( create function contacts_updated() returns trigger as ' begin - insert into contacts_history (area_id, category, email, editor, whenedited, note, confirmed, deleted) values (new.area_id, new.category, new.email, new.editor, new.whenedited, new.note, new.confirmed, new.deleted); + insert into contacts_history (contact_id, area_id, category, email, editor, whenedited, note, confirmed, deleted) values (new.id, new.area_id, new.category, new.email, new.editor, new.whenedited, new.note, new.confirmed, new.deleted); return new; end; ' language 'plpgsql'; diff --git a/notes/INSTALL-catalyst.txt b/notes/INSTALL-catalyst.txt index c3dfd0256..821b5a432 100644 --- a/notes/INSTALL-catalyst.txt +++ b/notes/INSTALL-catalyst.txt @@ -89,7 +89,7 @@ The DBIx::Class code uses a separate DBI connection than the mySociety::DBHandle FixMyStreet::App is a fairly standard Catalyst app, there aren't any really big surprises. -Note that the FixMyStree.pm file is used though to abstract some config related things. Note the FixMyStreet->test_mode(1) which will do things like send all emails to a memory queue for the test scripts. test_mode should only be used in test scripts, and so is different from setting STAGING to true. +Note that the FixMyStreet.pm file is used though to abstract some config related things. Note the FixMyStreet->test_mode(1) which will do things like send all emails to a memory queue for the test scripts. test_mode should only be used in test scripts, and so is different from setting STAGING to true. ############## testing ################## @@ -104,4 +104,4 @@ or a specific test in verbose mode using: prove -lv t/app/controller/report_new.t -For all the lovely options do 'prove --help'. Note I've made no attempt to make the tests be able to run in parallel, the database fiddling would not be worth it.
\ No newline at end of file +For all the lovely options do 'prove --help'. Note I've made no attempt to make the tests be able to run in parallel, the database fiddling would not be worth it. diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm index 903a8b97e..71650c0e4 100644 --- a/perllib/FixMyStreet/App/Controller/Report/New.pm +++ b/perllib/FixMyStreet/App/Controller/Report/New.pm @@ -520,7 +520,12 @@ sub determine_location_from_pc : Private { # $error doubles up to return multiple choices by being an array if ( ref($error) eq 'ARRAY' ) { - @$error = map { decode_utf8($_) } @$error; + @$error = map { + decode_utf8($_); + s/, United Kingdom//; + s/, UK//; + $_; + } @$error; $c->stash->{possible_location_matches} = $error; return; } |