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

Merge b668120883 into 9ff8becaf6

Browse source
This commit is contained in:
Stella Rouzi 2014-09-02 20:14:50 +00:00
commit a5ef222378
6 changed files with 13 additions and 8 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

3
app/models/user.rb
View file

@ -59,8 +59,7 @@ class User < ActiveRecord::Base
end
def setup_role
self.is_admin = true if User.count == 0
roles << Role.where(name: 'Admin') if User.count == 1
self.is_admin = true if User.count == 1
end
# Gets the roles of the user, groups them by role.name and returns the resource(s) of each role