bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

social plugin

Browse Source
This commit is contained in:
Andreas Stephanides
2015-02-11 01:14:52 +01:00
parent ebf486b347
commit 20240b75de
7 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/rubriken_controller.rb
View File

@@ -10,7 +10,7 @@ class RubrikenController < ApplicationController
@neuigkeiten = Neuigkeit.public.published.page(params[:page]).per(3)
end
@calentries= (@rubriken.map {|r| r.calendar}).collect(&:calentries).flatten
@calentries= (@rubriken.map {|r| r.calendar}).collect(&:calentries).flatten.select {|c| c.object !=nil}
respond_to do |format|
format.html
format.js {render action: :show}
@@ -29,7 +29,7 @@ class RubrikenController < ApplicationController
@rubrik = Rubrik.find(params[:id])
@moderatoren=User.with_role(:newsmoderator,@rubrik)
@calentries= @rubrik.calendar.calentries
@calentries= @rubrik.calendar.calentries.select {|c| c.object !=nil}
if can?(:showunpublished, Neuigkeit)
@neuigkeiten = @rubrik.neuigkeiten.page(params[:page]).per(3)
else