From 0de57e08a90d703101b9988b934a3841a952e1fe Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <st-andreas@gmx.at>
Date: Thu, 28 Feb 2013 09:57:54 +0100
Subject: [PATCH] small fixes

---
 app/models/ability.rb           | 12 ++++++------
 app/models/neuigkeit.rb         |  3 ++-
 app/views/moduls/_kurz.html.erb |  2 +-
 todo.TXT                        |  5 ++++-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/models/ability.rb b/app/models/ability.rb
index db14a6f..4d5e9f9 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -31,15 +31,15 @@ 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    
+  #  can :write, Neuigkeit if user.has_role?("newsmoderator", Neuigkeit.rubrik)
 
   end
 end
diff --git a/app/models/neuigkeit.rb b/app/models/neuigkeit.rb
index 9922d26..cbf4991 100644
--- a/app/models/neuigkeit.rb
+++ b/app/models/neuigkeit.rb
@@ -1,5 +1,6 @@
 class Neuigkeit < ActiveRecord::Base
   attr_accessible :datum, :text, :title
   belongs_to :author, :class_name =>'User'
-  belongs_to :rubrik, :class_name =>'Rubrik'
+  belongs_to :rubrik, :class_name =>'Rubrik', :foreign_key => "rubrik_id"
+
 end
diff --git a/app/views/moduls/_kurz.html.erb b/app/views/moduls/_kurz.html.erb
index 05e8a37..fb4ec32 100644
--- a/app/views/moduls/_kurz.html.erb
+++ b/app/views/moduls/_kurz.html.erb
@@ -1,5 +1,5 @@
 <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 >
   <%= raw(modul.desc) %>
diff --git a/todo.TXT b/todo.TXT
index 75131a4..14cf560 100644
--- a/todo.TXT
+++ b/todo.TXT
@@ -52,4 +52,7 @@ Versionsverfolgung
 
 Tiny MCE
 http://rubydoc.info/gems/tinymce-rails/3.5.8/frames
-integrieren
\ No newline at end of file
+integrieren
+
+
+Gollum WIKI Controller schreiben
\ No newline at end of file