meeting

2014-12-14 21:30:21 +01:00
parent aa98919e88
commit 07944bce89
16 changed files with 104 additions and 26 deletions
--- a/app/controllers/rubriken_controller.rb
+++ b/app/controllers/rubriken_controller.rb
@@ -29,7 +29,7 @@ class RubrikenController < ApplicationController

    @rubrik = Rubrik.find(params[:id])
    @moderatoren=User.with_role(:newsmoderator,@rubrik)
-    @calentries= @rubrik.calentries
+    @calentries= @rubrik.calendar.calentries
    if can?(:showunpublished, Neuigkeit)
      @neuigkeiten = @rubrik.neuigkeiten.page(params[:page]).per(3)
    else