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

cache key fix2

Browse Source
This commit is contained in:
Andreas Stephanides
2015-03-15 20:51:20 +01:00
parent 58f7fb8b27
commit 99a9ad6c07
5 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/home_controller.rb
View File

@@ -5,6 +5,10 @@ class HomeController < ApplicationController
if Thema.count>0
t=YAML.load_file("#{::Rails.root.to_s}/config/start_topic.yml")
@rubriken= Rubrik.accessible_by(current_ability, :show)
params[:month]= Date.today.month if params[:month].nil?
params[:year]= Date.today.year if params[:year].nil?
@calentries= (@rubriken.map {|r| r.calendar}).collect(&:calentries).flatten.select {|c| c.object !=nil}
@starttopic= @themen = Thema.where(:id=>t).first

6
app/controllers/rubriken_controller.rb
View File

@@ -10,6 +10,9 @@ class RubrikenController < ApplicationController
# @neuigkeiten = Neuigkeit.public.published.page(params[:page]).per(3)
# end
params[:month]= Date.today.month if params[:month].nil?
params[:year]= Date.today.year if params[:year].nil?
@rubriken= Rubrik.accessible_by(current_ability, :show)
@neuigkeiten = Neuigkeit.accessible_by(current_ability, :list).page(params[:page]).per(3)
@@ -28,6 +31,9 @@ class RubrikenController < ApplicationController
@rubrik = Rubrik.find(params[:id])
@moderatoren=User.with_role(:newsmoderator,@rubrik)
params[:month]= Date.today.month if params[:month].nil?
params[:year]= Date.today.year if params[:year].nil?
@calentries= @rubrik.calendar.calentries.select {|c| c.object !=nil}
@neuigkeiten = @rubrik.neuigkeiten.accessible_by(current_ability, :list).page(params[:page]).per(3)