Merge updates and fixes

This commit is contained in:
Priit Tark 2015-02-17 02:21:23 +02:00
parent 96d1c60dd8
commit 2e47bcf5cb
4 changed files with 9 additions and 11 deletions

View file

@ -5,7 +5,13 @@ class Ability
alias_action :show, :create, :update, :destroy, to: :crud
@user = user || AdminUser.new
@user.roles.each { |role| send(role) } if @user.roles
case @user.class.to_s
when 'AdminUser'
@user.roles.each { |role| send(role) } if @user.roles
when 'ApiUser'
epp
end
can :show, :dashboard
end