Merge remote-tracking branch 'origin/master'

9 files changed, 8 insertions, 12 deletions

diff --git a/.gitignore b/.gitignore
index 4785d883f..5f56f9b27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,10 @@ inc/
 _Inline/
 lib
 tags
+
+*.mo
+FixMyStreet-EmptyHomes.po
+
 /web/cobrands/fiksgatami/css.css
 /web/cobrands/southampton/css.css
 /web/cobrands/reading/css/css.css
@@ -23,6 +27,7 @@ tags
 /web/cobrands/fixmystreet/*.css
 /web/cobrands/bromley/*.css
 /web/cobrands/barnet/*.css
+/web/cobrands/zurich/*.css
 /web/photo
 /local
 
diff --git a/locale/.gitignore b/locale/.gitignore
deleted file mode 100644
index be1eb161e..000000000
--- a/locale/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/FixMyStreet-EmptyHomes.po
diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/.gitignore b/locale/cy_GB.UTF-8/LC_MESSAGES/.gitignore
deleted file mode 100644
index 49b8fd52e..000000000
--- a/locale/cy_GB.UTF-8/LC_MESSAGES/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/*.mo
-/FixMyStreet-EmptyHomes.po
diff --git a/locale/en_GB.UTF-8/LC_MESSAGES/.gitignore b/locale/en_GB.UTF-8/LC_MESSAGES/.gitignore
deleted file mode 100644
index 083ecb3a3..000000000
--- a/locale/en_GB.UTF-8/LC_MESSAGES/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/FixMyStreet-EmptyHomes.po
-/FixMyStreet-EmptyHomes.mo
-/FixMyStreet-Cities.po
-/FixMyStreet-Cities.mo
diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/.gitignore b/locale/nb_NO.UTF-8/LC_MESSAGES/.gitignore
deleted file mode 100644
index 214d1b7ed..000000000
--- a/locale/nb_NO.UTF-8/LC_MESSAGES/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/FixMyStreet.mo
diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/.gitignore b/locale/nn_NO.UTF-8/LC_MESSAGES/.gitignore
deleted file mode 100644
index 214d1b7ed..000000000
--- a/locale/nn_NO.UTF-8/LC_MESSAGES/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/FixMyStreet.mo
diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index 4de3d0d1e..298c75352 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -536,7 +536,7 @@ sub search_reports : Path('search_reports') {
         } elsif ($search =~ /^id:(\d+)$/) {
             $query = [
                 'me.id' => int($1),
-                'problem.id' => int($1),
+                'me.problem_id' => int($1),
             ];
         } elsif ($search =~ /^area:(\d+)$/) {
             $query = [];
diff --git a/templates/web/default/index.html b/templates/web/default/index.html
index b3ca36e8c..159a595bc 100644
--- a/templates/web/default/index.html
+++ b/templates/web/default/index.html
@@ -21,7 +21,7 @@
 
 [% TRY %][% INCLUDE 'front/news.html' %][% CATCH file %][% END %]
 
-[% INCLUDE 'around/postcode_form.html' %]
+[% PROCESS 'around/postcode_form.html' %]
 
 <div id="front_intro">
 
diff --git a/templates/web/fixmystreet/index.html b/templates/web/fixmystreet/index.html
index 5849977fc..492adbbe5 100644
--- a/templates/web/fixmystreet/index.html
+++ b/templates/web/fixmystreet/index.html
@@ -16,7 +16,7 @@ Modernizr.load({
 </script>
 [% END %]
 
-[% pre_container_extra = INCLUDE 'around/postcode_form.html' %]
+[% pre_container_extra = PROCESS 'around/postcode_form.html' %]
 [% INCLUDE 'header.html', title = '', bodyclass = 'frontpage fullwidthpage' %]
 
 [% IF error %]