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

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
d69a05a6 · Jean-Philippe Lang · 33493f80 · d69a05a6
Commit d69a05a6 authored Feb 16, 2008 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

roles_controller.rb app/controllers/roles_controller.rb +4 -5

No files found.
--- 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