app/models/cms_ability.rb in cms-fortress-1.0.6 vs app/models/cms_ability.rb in cms-fortress-1.0.7

@@ -4,13 +4,13 @@
   def initialize(user)
 
     if user && user.role && user.role.role_details
       user.role.role_details.each do |role|
         can :view, role.command if role.can_view?
-        can :manage, role.command if role.can_create?
+        can :manage, role.command if role.can_manage?
 
-        if role.can_create?
+        if role.can_manage?
           if role.command.eql?("settings.roles") 
             can :manage, Cms::Fortress::Role
           elsif role.command.eql?("settings.sites")
             can :manage, Cms::Site
           elsif role.command.eql?("settings.users")
@@ -21,38 +21,21 @@
             can :manage, Cms::File
           elsif role.command.eql?("designs.layouts")
             can :manage, Cms::Layout
           elsif role.command.eql?("designs.snippets")
             can :manage, Cms::Snippet
+          else
+            setup_role(role)
           end
         end
       end
     end
 
-    # Define abilities for the passed in user here. For example:
-    #
-    #   user ||= User.new # guest user (not logged in)
-    #   if user.admin?
-    #     can :manage, :all
-    #   else
-    #     can :read, :all
-    #   end
-    #
-    # The first argument to `can` is the action you are giving the user 
-    # permission to do.
-    # If you pass :manage it will apply to every action. Other common actions
-    # here are :read, :create, :update and :destroy.
-    #
-    # The second argument is the resource the user can perform the action on. 
-    # If you pass :all it will apply to every resource. Otherwise pass a Ruby
-    # class of the resource.
-    #
-    # The third argument is an optional hash of conditions to further filter the
-    # objects.
-    # For example, here the user can only update published articles.
-    #
-    #   can :update, Article, :published => true
-    #
-    # See the wiki for details:
-    # https://github.com/ryanb/cancan/wiki/Defining-Abilities
   end
+
+  # override this if you have custom role assignment
+  def setup_role(role)
+
+  end
+
+
 end