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

2015-01-14 09:08:51 +01:00
parent 5b0840a7d2 1731d1f3d2
commit 1d11b270cf
7 changed files with 17 additions and 50 deletions
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -120,10 +120,13 @@ class Ability
    # Calendar

    if( user.has_role?("fetuser") || user.has_role?("fetadmin"))
-      can :manage, Document
+      can [:edit, :update,:new,:create], Document
      can :manage, Meeting
      can :manage, Meetingtyp
    end    
+    if user.has_role?("fetadmin")
+      can :manage, Document
+    end
    if loggedin
    end
    can :show, Document, :typ=>11