From d72a342f32661a099686b2392aed95391217026b Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 20 Jan 2015 12:17:38 +0000
Subject: Add admin navigation link to Configuration page.

---
 perllib/FixMyStreet/App/Controller/Admin.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 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 b2e0bdc2e..3e5a1a95a 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -1197,8 +1197,8 @@ sub set_allowed_pages : Private {
              'questionnaire' => [_('Survey'), 4],
              'users' => [_('Users'), 5],
              'flagged'  => [_('Flagged'), 6],
-             'stats'  => [_('Stats'), 6],
-             'config' => [ undef, undef ],
+             'stats'  => [_('Stats'), 7],
+             'config' => [ _('Configuration'), 8],
              'user_edit' => [undef, undef], 
              'body' => [undef, undef],
              'body_edit' => [undef, undef],
-- 
cgit v1.2.3


From c4d726bacd492bd4281b9eddbdc29d3190444d3c Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 20 Jan 2015 12:51:07 +0000
Subject: Rename 'body_edit' admin endpoint to 'body'.

---
 perllib/FixMyStreet/App/Controller/Admin.pm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 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 3e5a1a95a..de13a76de 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -427,7 +427,7 @@ sub update_contacts : Private {
         # Remove any others
         $c->stash->{body}->body_areas->search( { area_id => [ keys %current ] } )->delete;
 
-        $c->stash->{updated} = _('Configuration updated - contacts will be generated automatically later');
+        $c->stash->{updated} = _('Values updated');
     }
 }
 
@@ -485,13 +485,13 @@ sub lookup_body : Private {
 }
 
 # This is for if the category name contains a '/'
-sub body_edit_all : Path('body_edit') {
+sub category_edit_all : Path('body') {
     my ( $self, $c, $body_id, @category ) = @_;
     my $category = join( '/', @category );
-    $c->go( 'body_edit', [ $body_id, $category ] );
+    $c->go( 'category_edit', [ $body_id, $category ] );
 }
 
-sub body_edit : Path('body_edit') : Args(2) {
+sub category_edit : Path('body') : Args(2) {
     my ( $self, $c, $body_id, $category ) = @_;
 
     $c->stash->{body_id} = $body_id;
@@ -1201,7 +1201,6 @@ sub set_allowed_pages : Private {
              'config' => [ _('Configuration'), 8],
              'user_edit' => [undef, undef], 
              'body' => [undef, undef],
-             'body_edit' => [undef, undef],
              'report_edit' => [undef, undef],
              'update_edit' => [undef, undef],
              'abuse_edit'  => [undef, undef],
-- 
cgit v1.2.3