Rescue and display an error message when trying to delete a role that is in use.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1159 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb
index a8a31cd4d263c8aef04206dda6798f87184849bc..4796bb7f05c78c52e20a1becd59f21e311cb82e8 100644 (file)
--- a/app/controllers/roles_controller.rb
+++ b/app/controllers/roles_controller.rb
@@ -53,12 +53,11 @@ class RolesController < ApplicationController
 
   def destroy
     @role = Role.find(params[:id])
-    #unless @role.members.empty?
-    #  flash[:error] = 'Some members have this role. Can\'t delete it.'
-    #else
-      @role.destroy
-    #end
+    @role.destroy
     redirect_to :action => 'list'
+  rescue
+    flash[:error] = 'This role is in use and can not be deleted.'
+    redirect_to :action => 'index'
   end
   
   def move