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

Merge branch 'master' of https://github.com/fetsite/fetsite

Browse Source 
Conflicts:
	Gemfile.lock
This commit is contained in:
Andreas Stephanides
2014-10-19 16:04:38 +02:00
parent a40e5307bf 2fbd277e21
commit 74c1877500
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/ability.rb
View File

@@ -23,6 +23,7 @@ class Ability
can :manage, Lva can :manage, Lva
can :manage, Studium can :manage, Studium
can :manage, Beispiel can :manage, Beispiel
can :manage, Lecturer
end end
unless user.has_role?("fetadmin") unless user.has_role?("fetadmin")
cannot :delete, Studium cannot :delete, Studium
@@ -34,7 +35,7 @@ class Ability
# Rechteverwaltung fuer Informationen # Rechteverwaltung fuer Informationen
can [:show, :index,:faqs], Themengruppe, :public=>true can [:show, :index,:faqs], Themengruppe, :public=>true
can [:show], Thema, :isdraft=>false can [:show], Thema, :isdraft=>false
can :show, Frage can :show, Frage
if loggedin if loggedin
end end
if( user.has_role?("fetuser") || user.has_role?("fetadmin")) if( user.has_role?("fetuser") || user.has_role?("fetadmin"))