Merge remote-tracking branch 'github/master'

Conflicts: app/models/ability.rb
2013-03-02 20:31:22 +01:00
parent cdf7acd426 0de57e08a9
commit f8ad8f4527
4 changed files with 16 additions and 8 deletions
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -31,15 +31,19 @@ class Ability
    
    # Rechteverwaltung f<>r Studien Modul
    can :read, Modulgruppe
-    if user.has_role? "newsadmin"
-      can :manage, Modulgruppe
-      can :addmoderator, Modulgruppe
-      can :addmoderator, Rubrik
-    end
+    can :manage, Modulgruppe


+ 
    # Rechteverwaltung fuer Neuigkeiten
+
 #    can :write, Neuigkeit if user.has_role?("newsmoderator", Neuigkeit.rubrik)

+   if user.has_role? "newsadmin"
+      can :addmoderator, Rubrik
+    end    
+
+
+
  end
 end