gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 8e8d049af0 into 1106f4e227

Browse source
This commit is contained in:
Gopesh Tulsyan 2014-09-11 13:32:03 +00:00
commit 5fc5aba344
11 changed files with 68 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/ability.rb
View file

@ -67,7 +67,7 @@ class Ability
signed_in(user) # Inherit abilities from signed user
# User with role
can :manage, User if user.is_admin # ??? || (user.has_role? :organizer, :any)
can :manage, User if user.is_admin || (user.has_role? :organizer, :any)
can [:new, :create], Conference if user.is_admin || (user.has_role? :organizer, :any)
can [:index, :show, :gallery_photos], Conference
can :manage, Conference, id: conf_ids_for_organizer