fix ability when not logged in
This commit is contained in:
parent
3a0d5f1017
commit
21e6432b41
2 changed files with 7 additions and 12 deletions
|
@ -16,10 +16,8 @@ class ApplicationController < ActionController::Base
|
||||||
end
|
end
|
||||||
|
|
||||||
def current_ability
|
def current_ability
|
||||||
if current_user
|
@current_ability ||=
|
||||||
@current_ability ||= Ability.new(current_user)
|
current_client.try { |c| ClientAbility.new(c) } ||
|
||||||
elsif current_client
|
Ability.new(current_user)
|
||||||
@current_ability ||= ClientAbility.new(current_client)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -2,13 +2,10 @@ class Ability
|
||||||
include CanCan::Ability
|
include CanCan::Ability
|
||||||
|
|
||||||
def initialize(user)
|
def initialize(user)
|
||||||
user ||= User.new # guest user (not logged in)
|
return unless user
|
||||||
|
|
||||||
if user.penning?
|
can :manage, :all if user.penning?
|
||||||
can :manage, :all
|
|
||||||
else
|
|
||||||
can :read, user, id: user.id
|
can :read, user, id: user.id
|
||||||
can :create, Transaction, debtor: user
|
can :create, Transaction, debtor: user
|
||||||
end
|
end
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue