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

AutoCommit Don Aug 27 15:03:02 CEST 2015

Browse Source
This commit is contained in:
Andreas Stephanides
2015-08-27 15:03:02 +02:00
parent 370c439c29
commit 7c2f1f9753
10 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/emails_controller.rb Normal file
View File

@@ -0,0 +1,7 @@
class EmailsController < ApplicationController
load_and_authorize_resource
def index
end
end

2
app/controllers/rubriken_controller.rb
View File

@@ -16,7 +16,7 @@ class RubrikenController < ApplicationController
@rubriken= Rubrik.accessible_by(current_ability, :show)
@neuigkeiten = Neuigkeit.accessible_by(current_ability, :list).page(params[:page]).per(3)
@calentries= (@rubriken.map {|r| r.calendar}).collect(&:calentries).flatten.select {|c| c.object !=nil}
@calentries= (@rubriken.map {|r| r.calendar.calentries.of_month(Date.new(params[:year],params[:month],1))}).flatten.select {|c| c.object !=nil}
respond_to do |format|
format.html
format.js {render action: :show}