roles_controller.rb in the_role-1.6.0

- old
+ new

@@ -1,13 +1,15 @@
 class Admin::RolesController < ApplicationController
   include TheRole::Requires
+  layout 'the_role'
 
-  before_filter :role_login_required
-  before_filter :role_require
-  before_filter :role_find,           :only => [:show, :edit, :update, :destroy]
-  before_filter :owner_require,       :only => [:show, :edit, :update, :destroy]
+  before_filter :login_required
+  before_filter :role_required
 
+  before_filter :role_find,      :only => [:edit, :update, :destroy]
+  before_filter :owner_required, :only => [:edit, :update, :destroy]
+
   def index
     @roles = Role.all(:order => "created_at ASC")
   end
 
   def new
@@ -43,9 +45,9 @@
 
   protected
 
   def role_find
     @role = Role.find params[:id]
-    @object_for_ownership_checking = @role
+    @ownership_checking_object = @role
   end
   
-end
+end
\ No newline at end of file