Cat name; ignore County on reports page.

3 files changed, 9 insertions, 7 deletions

diff --git a/bin/send-reports b/bin/send-reports
index a0fac7578..facd6e28d 100755
--- a/bin/send-reports
+++ b/bin/send-reports
@@ -6,7 +6,7 @@
 # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
 # Email: matthew@mysociety.org. WWW: http://www.mysociety.org
 #
-# $Id: send-reports,v 1.60 2008-10-16 16:18:18 matthew Exp $
+# $Id: send-reports,v 1.61 2008-11-17 17:52:16 matthew Exp $
 
 use strict;
 require 5.8.0;
@@ -98,7 +98,7 @@ foreach my $row (@$unsent) {
         my $name = $areas_info->{$council}->{name};
         my ($council_email, $confirmed, $note) = dbh()->selectrow_array(
             "SELECT email,confirmed,note FROM contacts WHERE deleted='f'
-                and area_id=? AND category=?", {}, $council, 'Empty Property');
+                and area_id=? AND category=?", {}, $council, 'Empty property');
         unless ($confirmed) {
             $note = 'Council ' . $council . ' deleted' unless $note;
             $council_email = 'N/A' unless $council_email;
diff --git a/web-admin/index.cgi b/web-admin/index.cgi
index 37fa79097..c6349de40 100755
--- a/web-admin/index.cgi
+++ b/web-admin/index.cgi
@@ -7,10 +7,10 @@
 # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
 # Email: francis@mysociety.org; WWW: http://www.mysociety.org/
 #
-# $Id: index.cgi,v 1.62 2008-11-11 10:54:03 matthew Exp $
+# $Id: index.cgi,v 1.63 2008-11-17 17:52:16 matthew Exp $
 #
 
-my $rcsid = ''; $rcsid .= '$Id: index.cgi,v 1.62 2008-11-11 10:54:03 matthew Exp $';
+my $rcsid = ''; $rcsid .= '$Id: index.cgi,v 1.63 2008-11-17 17:52:16 matthew Exp $';
 
 use strict;
 
@@ -203,7 +203,7 @@ sub admin_council_contacts ($$) {
     if ($posted eq 'new') {
         my $email = trim($q->param('email'));
         my $category = trim($q->param('category'));
-        $category = 'Empty Property' if $q->{site} eq 'emptyhomes';
+        $category = 'Empty property' if $q->{site} eq 'emptyhomes';
         # History is automatically stored by a trigger in the database
         my $update = dbh()->do("update contacts set
             email = ?,
diff --git a/web/reports.cgi b/web/reports.cgi
index 913a1fbaf..45194e32e 100755
--- a/web/reports.cgi
+++ b/web/reports.cgi
@@ -7,7 +7,7 @@
 # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
 # Email: matthew@mysociety.org. WWW: http://www.mysociety.org
 #
-# $Id: reports.cgi,v 1.21 2008-10-15 22:07:26 matthew Exp $
+# $Id: reports.cgi,v 1.22 2008-11-17 17:52:16 matthew Exp $
 
 use strict;
 use Standard;
@@ -108,7 +108,9 @@ sub main {
         %councils = ( $one_council => 1 );
     } else {
         # Show all councils on main report page
-        my @types = grep { !/LGD/ } @$mySociety::VotingArea::council_parent_types;
+        $ignore = 'LGD';
+        $ignore .= '|CTY' if $q->{site} eq 'emptyhomes';
+        my @types = grep { !/$ignore/ } @$mySociety::VotingArea::council_parent_types;
         %councils = map { $_ => 1 } @{mySociety::MaPit::get_areas_by_type(\@types)};
     }