andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:andreassteph/fetsite

Browse Source 
Conflicts:
	app/models/neuigkeit.rb
This commit is contained in:
Andreas Stephanides
2013-08-23 12:02:45 +02:00
parent 6d925b1b3d 57b015a44e
commit fabf9d26a6
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/neuigkeit.rb
View File

@@ -20,6 +20,8 @@ class Neuigkeit < ActiveRecord::Base
validates :rubrik, :presence=>true validates :rubrik, :presence=>true
validates :author, :presence=>true validates :author, :presence=>true
translates :title,:text, :versioning=>true, :fallbacks_for_empty_translations => true translates :title,:text, :versioning=>true, :fallbacks_for_empty_translations => true
scope :published, -> {where("datum >= ?", Time.now.to_date)} scope :published, -> {where("datum >= ?", Time.now.to_date)}
scope :recent, -> { where("updated_at >= ? ",Time.now - 7.days)}
end end

13
app/views/rubriken/index.html.erb
View File

@@ -1,16 +1,11 @@
<%= render 'tabs' %> <%= render 'tabs' %>
<h1><%= I18n.t("rubrik.title")%></h1> <h1><%= I18n.t("rubrik.title")%></h1>
<% @rubriken.each do |rubrik| %> <% @rubriken.each do |rubrik| %>
<% rubrik.neuigkeiten.recent.each do |n| %>
<%= <li><%= link_to n.title+"("+rubrik.name+")" , n %> </li>
html="<b>".html_safe + rubrik.name + "</b> <br>".html_safe + rubrik.desc + "<br>".html_safe <% end %>
<%= link_to 'Weitere Artikel zu '+rubrik.name.to_s , rubrik %>
link_to( html , rubrik )%>
<% end %> <% end %>