bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Issue #52

Browse Source
This commit is contained in:
Andreas Stephanides
2013-12-01 12:14:04 +01:00
parent 91e41b76c8
commit 13dd45e783
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/fetprofile.rb
View File

@@ -23,14 +23,13 @@ class Fetprofile < ActiveRecord::Base
validates :desc, :presence=>true validates :desc, :presence=>true
validates :nachname, length:{minimum: 3},:presence=>true validates :nachname, length:{minimum: 3},:presence=>true
validates :vorname, length:{minimum: 3},:presence=>true validates :vorname, length:{minimum: 3},:presence=>true
validates :short, length:{minimum: 3},:presence=>true
accepts_nested_attributes_for :memberships, :reject_if=>lambda{|a| a[:typ].blank?|| a[:start].blank? ||a[:gremium_id].blank?} accepts_nested_attributes_for :memberships, :reject_if=>lambda{|a| a[:typ].blank?|| a[:start].blank? ||a[:gremium_id].blank?}
def name def name
[vorname, nachname, "(",short,")"].join(" ") [vorname, nachname, ((short.empty?)? "": ["(",short,")"].join)].join(" ")
end end
scope :active, -> { where(:active=>true).order(:vorname) } scope :active, -> { where(:active=>true).order(:vorname) }
def fetmail def fetmail
(fetmailalias.nil? || fetmailalias.empty?) ? short.to_s + "@fet.at" : fetmailalias.to_s + "@fet.at" (fetmailalias.nil? || fetmailalias.empty?) ? short.to_s + "@fet.at" : fetmailalias.to_s + "@fet.at"

2
app/views/fetprofiles/show.html.erb
View File

@@ -8,7 +8,7 @@
<div class="media-body"> <div class="media-body">
<h2><%= @fetprofile.name %></h2> <h2><%= @fetprofile.name %></h2>
<p> <p>
<%= @fetprofile.fetmailalias %> <%= @fetprofile.fetmail %>
</p> </p>
<p> <p>
<%= @fetprofile.desc %> <%= @fetprofile.desc %>