andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Andreas Stephanides
2014-12-03 02:41:54 +01:00
parent 87dd70ea44
commit b259c1080a
2 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/models/ability.rb
View File

@@ -114,15 +114,14 @@ class Ability
unless user.has_role?("fetadmin")
cannot :delete, Rubrik
cannot :delete, Neuigkeit
end
# Calendar
if( user.has_role?("fetuser") || user.has_role?("fetadmin"))
can :manage, Document
can :manage, Meeting
can :manage, Meetingtyp
end
if( user.has_role?("fetuser") || user.has_role?("fetadmin"))
can :manage, Document
can :manage, Meeting
can :manage, Meetingtyp
end
# Rechteverwaltung Kalender
can [:show, :index], Calendar, :public => true
@@ -130,8 +129,6 @@ class Ability
can [:show], Calentry
if( user.has_role?("fetuser") || user.has_role?("fetadmin"))
can [:show,:index], Calendar
can [:edit, :update,:new,:create,:verwalten], Calendar
can [:edit, :update,:new,:create,:verwalten,:delete], Calentry