small fixes
This commit is contained in:
@@ -31,15 +31,15 @@ class Ability
|
|||||||
|
|
||||||
# Rechteverwaltung f<>r Studien Modul
|
# Rechteverwaltung f<>r Studien Modul
|
||||||
can :read, Modulgruppe
|
can :read, Modulgruppe
|
||||||
if user.has_role? "newsadmin"
|
|
||||||
can :manage, Modulgruppe
|
can :manage, Modulgruppe
|
||||||
can :addmoderator, Modulgruppe
|
|
||||||
can :addmoderator, Rubrik
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
# Rechteverwaltung fuer Neuigkeiten
|
# Rechteverwaltung fuer Neuigkeiten
|
||||||
can :write, Neuigkeit if user.has_role?("newsmoderator", Neuigkeit.rubrik)
|
if user.has_role? "newsadmin"
|
||||||
|
can :addmoderator, Rubrik
|
||||||
|
end
|
||||||
|
# can :write, Neuigkeit if user.has_role?("newsmoderator", Neuigkeit.rubrik)
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
class Neuigkeit < ActiveRecord::Base
|
class Neuigkeit < ActiveRecord::Base
|
||||||
attr_accessible :datum, :text, :title
|
attr_accessible :datum, :text, :title
|
||||||
belongs_to :author, :class_name =>'User'
|
belongs_to :author, :class_name =>'User'
|
||||||
belongs_to :rubrik, :class_name =>'Rubrik'
|
belongs_to :rubrik, :class_name =>'Rubrik', :foreign_key => "rubrik_id"
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<div style="border: solid 1px; padding:2px;margin-top:5px;"><p>
|
<div style="border: solid 1px; padding:2px;margin-top:5px;"><p>
|
||||||
<b><%= link_to "Modul "+ modul.name , modul_path(modul) %> </b>
|
<b><% if !modul.name.nil? %><%= link_to "Modul "+ modul.name , modul_path(modul) %> <%end%></b>
|
||||||
</p>
|
</p>
|
||||||
<p >
|
<p >
|
||||||
<%= raw(modul.desc) %>
|
<%= raw(modul.desc) %>
|
||||||
|
|||||||
Reference in New Issue
Block a user