small fixes rubriken und themen

This commit is contained in:
Andreas Stephanides
2014-04-11 13:02:00 +02:00
parent 9b6907f4cb
commit e9be76d6e4
8 changed files with 64 additions and 41 deletions

View File

@@ -9,6 +9,11 @@ class NeuigkeitenController < ApplicationController
def show
@neuigkeit = Neuigkeit.find(params[:id])
@rubrik=@neuigkeit.rubrik
if can?(:shownonpublic, Rubrik)
@rubriken = Rubrik.all
else
@rubriken = Rubrik.where(:public=>true)
end
if !params[:version].nil?
@neuigkeit.assign_attributes(@neuigkeit.translation.versions.reverse[params[:version].to_i].reify.attributes.select{|k,v| @neuigkeit.translated_attribute_names.include? k.to_sym })