diff app/controllers/roles_controller.rb @ 511:107d36338b70 live

Merge from branch "cannam"

--- a/app/controllers/roles_controller.rb	Thu Jun 09 16:51:06 2011 +0100
+++ b/app/controllers/roles_controller.rb	Thu Jul 14 10:43:07 2011 +0100
@@ -38,9 +38,10 @@
       end
       flash[:notice] = l(:notice_successful_create)
       redirect_to :action => 'index'
+    else
+      @permissions = @role.setable_permissions
+      @roles = Role.find :all, :order => 'builtin, position'
     end
-    @permissions = @role.setable_permissions
-    @roles = Role.find :all, :order => 'builtin, position'
   end
 
   def edit
@@ -48,8 +49,9 @@
     if request.post? and @role.update_attributes(params[:role])
       flash[:notice] = l(:notice_successful_update)
       redirect_to :action => 'index'
+    else
+      @permissions = @role.setable_permissions  
     end
-    @permissions = @role.setable_permissions
   end
 
   def destroy