diff --git a/app/models/neuigkeit.rb b/app/models/neuigkeit.rb index c258806..45bd7f8 100755 --- a/app/models/neuigkeit.rb +++ b/app/models/neuigkeit.rb @@ -20,6 +20,8 @@ class Neuigkeit < ActiveRecord::Base validates :rubrik, :presence=>true validates :author, :presence=>true translates :title,:text, :versioning=>true, :fallbacks_for_empty_translations => true + scope :published, -> {where("datum >= ?", Time.now.to_date)} - + scope :recent, -> { where("updated_at >= ? ",Time.now - 7.days)} + end diff --git a/app/views/rubriken/index.html.erb b/app/views/rubriken/index.html.erb index 7591824..0403397 100755 --- a/app/views/rubriken/index.html.erb +++ b/app/views/rubriken/index.html.erb @@ -1,16 +1,11 @@ - - <%= render 'tabs' %>

<%= I18n.t("rubrik.title")%>

<% @rubriken.each do |rubrik| %> - - <%= - html="".html_safe + rubrik.name + "
".html_safe + rubrik.desc + "
".html_safe - - link_to( html , rubrik )%> - - +<% rubrik.neuigkeiten.recent.each do |n| %> +
  • <%= link_to n.title+"("+rubrik.name+")" , n %>
  • +<% end %> +<%= link_to 'Weitere Artikel zu '+rubrik.name.to_s , rubrik %> <% end %>