nlinks fetprofile added

This commit is contained in:
Andreas Stephanides
2014-04-06 23:01:37 +02:00
parent 4c9a3c8999
commit 58c46375a1
6 changed files with 11 additions and 5 deletions

View File

@@ -27,7 +27,11 @@ validates :desc, :presence=>true
scope :search, ->(query) {where("nachname like ? or vorname like ? or short like ?", "%#{query}%", "%#{query}%", "%#{query}%")}
accepts_nested_attributes_for :memberships, :reject_if=>lambda{|a| a[:typ].blank?|| a[:start].blank? ||a[:gremium_id].blank?}, :allow_destroy=>true
has_many :nlinks, as: :link
def title
self.name
end
def name
[vorname, nachname, ((short.empty?)? "": ["(",short,")"].join)].join(" ")
end

View File

@@ -28,7 +28,7 @@ class Neuigkeit < ActiveRecord::Base
scope :unpublished, -> {where("datum >= ? OR datum IS NULL", Date.today)}
scope :public, ->{includes(:rubrik).where("rubriken.public"=>:true)}
scope :search, ->(query) {where("text like ? or title like ?", "%#{query}%", "%#{query}%")}
LINKTYPES=["Thema", "Gallery", "Lva","Studium"]
LINKTYPES=["Thema", "Gallery", "Lva","Studium","Fetprofile"]
accepts_nested_attributes_for :calentries, :allow_destroy=>true , :reject_if=> lambda{|a| a[:start].blank?}
before_validation :sanitize
has_many :nlinks

View File

@@ -0,0 +1 @@
<h2><%= nlink.title %></h2>

View File

@@ -0,0 +1,2 @@
<h2><%= nlink.name %></h2>
<p><%= nlink.desc_first_words %></p>

View File

@@ -1 +1,2 @@
<%= raw(strip_links(render :partial=> "themen/small", :object=>nlink)) %>
<h2><%= nlink.title %></h2>
<p><%= raw(nlink.text_first_words) %></p>

View File

@@ -1,5 +1,3 @@
<a name="thema_<%=small.id%>" href="#<%=small.id%>">
<h2><%= small.title %></h2>
</a>