@@ -1,5 +1,4 @@ $Id$ -- Add ability to have feed item content run through TT view - Added method to set config->mango->conrollers-name - Added rating/s() and comments() to Object using Ratings/Comments models - Cleanup blessed TODO @@ -16,7 +16,7 @@ BEGIN { ); } -sub index : Template('admin/users/index') { +sub list : Chained('/') PathPrefix Args(0) Template('admin/users/index') { my ( $self, $c ) = @_; my $page = $c->request->param('page') || 1; my $users = $c->model('Users')->search( @@ -34,7 +34,7 @@ sub index : Template('admin/users/index') { return; } -sub load : Chained('/') PathPrefix CaptureArgs(1) { +sub instance : Chained('/') PathPrefix CaptureArgs(1) { my ( $self, $c, $id ) = @_; my $user = $c->model('Users')->get_by_id($id); @@ -95,7 +95,7 @@ sub create : Local Template('admin/users/create') { return; } -sub edit : Chained('load') PathPart Args(0) Template('admin/users/edit') { +sub edit : Chained('instance') PathPart Args(0) Template('admin/users/edit') { my ( $self, $c ) = @_; my $user = $c->stash->{'user'}; my $profile = $c->stash->{'profile'}; @@ -160,7 +160,7 @@ sub edit : Chained('load') PathPart Args(0) Template('admin/users/edit') { return; } -sub delete : Chained('load') PathPart Args(0) Template('admin/users/delete') { +sub delete : Chained('instance') PathPart Args(0) Template('admin/users/delete') { my ( $self, $c ) = @_; my $form = $self->form; my $user = $c->stash->{'user'}; @@ -188,7 +188,7 @@ sub delete : Chained('load') PathPart Args(0) Template('admin/users/delete') { $user->destroy; $c->res->redirect( - $c->uri_for( $self->action_for('index') ) . '/' ); + $c->uri_for( $self->action_for('list') ) . '/' ); } else { $c->stash->{'errors'} = ['ID_MISTMATCH']; } lib/Mango/Catalyst/Controller/Admin/Users.pm @@ -10,7 +10,7 @@ </tr> <tr> <td></td> - <td colspan="3"><a href="[% c.uri_for('create/') %]">[% c.loc('LABEL_NEW_USER') %]</a></td> + <td colspan="3"><a href="[% c.uri_for_resource('mango/admin/users', 'create') %]/">[% c.loc('LABEL_NEW_USER') %]</a></td> </tr> [% WHILE (user = users.next) %] <tr> @@ -18,10 +18,11 @@ [% CALL delete_form.values(id => user.id) %] [% CALL delete_form.action(c.uri_for(user.id, 'delete/')) %] [% delete_form.render( + 'action', c.uri_for_resource('mango/admin/users', 'delete', [user.id]) _ '/', 'id', 'admin_users_delete_' _ user.id ) %] </td> - <td><a href="[% c.uri_for(user.id, 'edit/') %]">[% HTML.escape(user.username) %]</a></td> + <td><a href="[% c.uri_for_resource('mango/admin/users', 'edit', [user.id]) %]/">[% HTML.escape(user.username) %]</a></td> <td>[% user.created %]</td> <td>[% user.updated %]</td> </tr> share/templates/tt/html/admin/users/index @@ -1,5 +1,5 @@ <ul> - <li><a href="[% c.uri_for_resource('mango/admin/users') %]/">Users</a></li> + <li><a href="[% c.uri_for_resource('mango/admin/users', 'list') %]/">Users</a></li> <li><a href="[% c.uri_for_resource('mango/admin/roles') %]/">Roles</a></li> <li><a href="[% c.uri_for_resource('mango/admin/products') %]/">Products</a></li> </ul> share/templates/tt/html/includes/admin/menu 11a3c9913bace99e713156d276fea027d30eae74 claco claco@52a70e3a-55ec-0310-b14e-7917f69ecacc http://github.com/claco/mango/commit/d2397a6dba1ec0ed00e02545b41daf85ba205e50 d2397a6dba1ec0ed00e02545b41daf85ba205e50 2008-05-24T19:08:10-07:00 2008-05-24T19:08:10-07:00 r1618@mbp: claco | 2008-05-24 15:10:12 -0400 User Admin controller has Chained index and Path tests. git-svn-id: http://svn.icantfocus.com/CPAN/Mango/trunk@2168 52a70e3a-55ec-0310-b14e-7917f69ecacc e902100256e792a0628dd91b33b578b12f232315 claco claco@52a70e3a-55ec-0310-b14e-7917f69ecacc