bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

key, ability fixes

Browse Source
This commit is contained in:
Andreas Stephanides
2015-06-10 17:11:21 +02:00
parent c57095bbca
commit f62ed335ec
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/ability.rb
View File

@@ -169,10 +169,14 @@ end
can [:showics], Calendar
# can [:show], Calentry
if (!k.nil? && k.typ==1 && (k.user.has_role?("fetuser")||k.user.has_role?("fetadmin")))
can [:show,:index], Calendar
if k.parent.nil?
can [:show,:index], Calendar
else
can [:show], Calendar, id: k.parent_id
end
end
if( user.has_role?("fetuser") || user.has_role?("fetadmin")||)
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