Removed fine grained roles in favour of groups

alanhaggai · Oct 27, 2009 · 1cfe3e1 · 1cfe3e1
1 parent 7b28aff
commit 1cfe3e1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/ez_360.db b/ez_360.db
diff --git a/lib/EZ/360/Controller/Article.pm b/lib/EZ/360/Controller/Article.pm
@@ -19,7 +19,7 @@ Catalyst Controller.
 sub create : Local : Args(0) {
     my ( $self, $c ) = @_;
 
-    $c->forward( '/check_user_roles', [ qw/can-create-article/ ] );
+    $c->forward( '/check_user_roles', [qw/user/] );
 
     if ( lc $c->request->method() eq 'post' ) {
         my $title   = $c->request->body_params->{'title'};
@@ -64,8 +64,7 @@ sub create : Local : Args(0) {
 sub list : Local : Args(0) {
     my ( $self, $c ) = @_;
 
-    $c->forward( '/check_user_roles',
-        [ qw/ can-create-article can-update-article can-delete-article / ] );
+    $c->forward( '/check_user_roles', [qw/user/] );
 
     $c->stash(
         articles => [ $c->model('DB::Article')->all() ],
@@ -89,7 +88,7 @@ sub id : Chained('/') : PathPart('article') : CaptureArgs(1) {
 sub delete : Chained('id') : PathPart('delete') : Args(0) {
     my ( $self, $c ) = @_;
 
-    $c->forward( '/check_user_roles', [ qw/can-delete-article/ ] );
+    $c->forward( '/check_user_roles', [qw/user/] );
 
     if ( lc $c->request->method() eq 'post' ) {
         eval { $c->stash->{article}->delete(); };
@@ -122,7 +121,7 @@ sub delete : Chained('id') : PathPart('delete') : Args(0) {
 sub update : Chained('id') : PathPart('update') : Args(0) {
     my ( $self, $c ) = @_;
 
-    $c->forward( '/check_user_roles', [ qw/can-update-article/ ] );
+    $c->forward( '/check_user_roles', [qw/user/] );
 
     if ( lc $c->request->method() eq 'post' ) {
         my $title   = $c->request->body_params->{'title'};
@@ -162,8 +161,7 @@ sub update : Chained('id') : PathPart('update') : Args(0) {
 sub retrieve : Chained('id') : PathPart('retrieve') : Args(0) {
     my ( $self, $c ) = @_;
 
-    $c->forward( '/check_user_roles',
-        [ qw/ can-create-article can-update-article can-delete-article / ] );
+    $c->forward( '/check_user_roles', [qw/user/] );
 
     $c->stash( template => 'article/retrieve.html' );
 }

diff --git a/lib/EZ/360/Controller/Page.pm b/lib/EZ/360/Controller/Page.pm
@@ -23,6 +23,8 @@ Catalyst Controller.
 sub create : Local : Args(0) {
     my ( $self, $c ) = @_;
 
+    $c->forward( '/check_user_roles', [qw/user/] );
+
     if ( lc $c->request->method() eq 'post' ) {
         my $title           = $c->request->body_params->{'title'};
         my $articles_string = $c->request->body_params->{'articles-string'};
@@ -72,6 +74,8 @@ sub create : Local : Args(0) {
 sub list : Local : Args(0) {
     my ( $self, $c ) = @_;
 
+    $c->forward( '/check_user_roles', [qw/user/] );
+
     $c->stash(
         pages    => [ $c->model('DB::Page')->all() ],
         template => 'page/list.html'
@@ -94,6 +98,8 @@ sub id : Chained('/') : PathPart('page') : CaptureArgs(1) {
 sub retrieve : Chained('id') : PathPart('retrieve') : Args(0) {
     my ( $self, $c ) = @_;
 
+    $c->forward( '/check_user_roles', [qw/user/] );
+
     $c->stash( template => 'page/retrieve.html' );
 }
 

diff --git a/lib/EZ/360/Controller/User.pm b/lib/EZ/360/Controller/User.pm
@@ -19,7 +19,7 @@ Catalyst Controller.
 sub create : Local : Args(0) {
     my ( $self, $c ) = @_;
 
-    $c->forward( '/check_user_roles', [qw/can-create-user/] );
+    $c->forward('/check_user_roles');
 
     if ( lc $c->request->method() eq 'post' ) {
         my $username = $c->request->body_params->{'username'};
@@ -74,8 +74,7 @@ sub create : Local : Args(0) {
 sub list : Local : Args(0) {
     my ( $self, $c ) = @_;
 
-    $c->forward( '/check_user_roles',
-        [qw/ can-create-user can-delete-user can-update-user /] );
+    $c->forward( '/check_user_roles', [qw/user/] );
 
     $c->stash(
         users_rs => $c->model('DB::User'),
@@ -100,7 +99,7 @@ sub update : Chained('id') : PathPart('update') : Args(0) {
     my $user = $c->stash->{user};
 
     if ( $c->user->id() != $user->id() ) {
-        $c->forward( '/check_user_roles', [qw/can-update-user/] );
+        $c->forward('/check_user_roles');
     }
 
     if ( lc $c->request->method() eq 'post' ) {
@@ -162,7 +161,7 @@ sub update : Chained('id') : PathPart('update') : Args(0) {
 sub delete : Chained('id') : PathPart('delete') : Args(0) {
     my ( $self, $c ) = @_;
 
-    $c->forward( '/check_user_roles', [qw/can-delete-user/] );
+    $c->forward('/check_user_roles');
 
     if ( lc $c->request->method() eq 'post' ) {
         eval { $c->stash->{user}->delete(); };
@@ -193,8 +192,7 @@ sub delete : Chained('id') : PathPart('delete') : Args(0) {
 sub retrieve : Chained('id') : PathPart('retrieve') : Args(0) {
     my ( $self, $c ) = @_;
 
-    $c->forward( '/check_user_roles',
-        [qw/ can-create-user can-delete-user can-update-user /] );
+    $c->forward( '/check_user_roles', [qw/user/] );
 
     $c->stash( template => 'user/retrieve.html' );
 }