diff --git a/app/models/fetprofile.rb b/app/models/fetprofile.rb index 92bfb28..787c175 100644 --- a/app/models/fetprofile.rb +++ b/app/models/fetprofile.rb @@ -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 diff --git a/app/models/neuigkeit.rb b/app/models/neuigkeit.rb index 2ae2c67..e5b710b 100755 --- a/app/models/neuigkeit.rb +++ b/app/models/neuigkeit.rb @@ -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 diff --git a/app/views/fetprofiles/_nlink.html.erb b/app/views/fetprofiles/_nlink.html.erb new file mode 100644 index 0000000..b3362c1 --- /dev/null +++ b/app/views/fetprofiles/_nlink.html.erb @@ -0,0 +1 @@ +
<%= nlink.desc_first_words %>
diff --git a/app/views/themen/_nlink.html.erb b/app/views/themen/_nlink.html.erb index 1685d5d..a13e118 100644 --- a/app/views/themen/_nlink.html.erb +++ b/app/views/themen/_nlink.html.erb @@ -1 +1,2 @@ -<%= raw(strip_links(render :partial=> "themen/small", :object=>nlink)) %> +<%= raw(nlink.text_first_words) %>
diff --git a/app/views/themen/_small.html.erb b/app/views/themen/_small.html.erb index 61eb45e..dfe8095 100644 --- a/app/views/themen/_small.html.erb +++ b/app/views/themen/_small.html.erb @@ -1,5 +1,3 @@ - -