From ea1ecdb43b879ce3355aa11167ae11f5f444bd65 Mon Sep 17 00:00:00 2001
From: Dave Whiteland <dave@mysociety.org>
Date: Sun, 4 Aug 2013 18:20:46 +0100
Subject: show "no bodies" hint on empty body db

---
 perllib/FixMyStreet/App/Controller/Admin.pm | 3 +++
 1 file changed, 3 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 133c83024..69238f90f 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -130,6 +130,9 @@ sub index : Path : Args(0) {
 
     $c->stash->{categories} = $c->cobrand->problems->categories_summary();
 
+	if ($c->config->{SHOW_ADMIN_HINTS}) {
+		$c->stash->{total_bodies} = $c->model('DB::Body')->count();
+	}
     return 1;
 }
 
-- 
cgit v1.2.3


From db265d6814d3a3ab05ad3eea7ae2442433db05b7 Mon Sep 17 00:00:00 2001
From: Dave Whiteland <dave@mysociety.org>
Date: Wed, 14 Aug 2013 16:10:02 +0100
Subject: remove SHOW_ADMIN_HINTS config

admin hints are displayed *like it or not*
(actually, could hide for a given cobrand with CSS setting display:none)
---
 perllib/FixMyStreet/App/Controller/Admin.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(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 69238f90f..5393e98bb 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -130,9 +130,8 @@ sub index : Path : Args(0) {
 
     $c->stash->{categories} = $c->cobrand->problems->categories_summary();
 
-	if ($c->config->{SHOW_ADMIN_HINTS}) {
-		$c->stash->{total_bodies} = $c->model('DB::Body')->count();
-	}
+    $c->stash->{total_bodies} = $c->model('DB::Body')->count();
+
     return 1;
 }
 
-- 
cgit v1.2.3


From 404b8328ec8022513df39723112a2084be341e61 Mon Sep 17 00:00:00 2001
From: Dave Whiteland <dave@mysociety.org>
Date: Thu, 15 Aug 2013 08:17:57 +0100
Subject: show warning on body with no live contacts

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

(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 5393e98bb..5e98c5d04 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -432,6 +432,7 @@ sub display_contacts : Private {
 
     my $contacts = $c->stash->{body}->contacts->search(undef, { order_by => [ 'category' ] } );
     $c->stash->{contacts} = $contacts;
+    $c->stash->{live_contacts} = $contacts->search({ deleted => 0 });
 
     if ( $c->req->param('text') && $c->req->param('text') == 1 ) {
         $c->stash->{template} = 'admin/council_contacts.txt';
-- 
cgit v1.2.3


From 367fdaba0686150e841e879445ad2378f2f4d897 Mon Sep 17 00:00:00 2001
From: Dave Whiteland <dave@mysociety.org>
Date: Fri, 23 Aug 2013 08:32:49 +0100
Subject: clarify presentation on lagged users page

now shows which flagged users are in abuse table, which seems important
(separate issue #523 to make managing and indeed viewing abuse table)
---
 perllib/FixMyStreet/App/Controller/Admin.pm | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(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 5e98c5d04..ba8f22a05 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -1027,8 +1027,20 @@ sub flagged : Path('flagged') : Args(0) {
     $c->stash->{problems} = [ $problems->all ];
 
     my $users = $c->model('DB::User')->search( { flagged => 1 } );
+    my @users = $users->all;
+    my %email2user = map { $_->email => $_ } @users;
+    $c->stash->{users} = [ @users ];
 
-    $c->stash->{users} = $users;
+    my @abuser_emails = $c->model('DB::Abuse')->all();
+
+    foreach my $email (@abuser_emails) {
+        # Slight abuse of the boolean flagged value
+        if ($email2user{$email->email}) {
+            $email2user{$email->email}->flagged( 2 );
+        } else {
+            push @{$c->stash->{users}}, { email => $email->email, flagged => 2 };
+        }
+    }
 
     return 1;
 }
-- 
cgit v1.2.3