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

Issue #64 fixed

Browse Source
This commit is contained in:
Andreas Stephanides
2013-12-01 12:05:08 +01:00
parent b779701ffe
commit e68d8a06d8
6 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/fetprofile.rb
View File

@@ -25,10 +25,12 @@ validates :desc, :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?}
def name
[vorname, nachname, "(",short,")"].join(" ")
end
accepts_nested_attributes_for :memberships, :reject_if=>lambda{|a| a[:typ].blank?|| a[:start].blank? ||a[:fetprofile_id].blank?}
scope :active, -> { where(:active=>true).order(:vorname) }
def fetmail
(fetmailalias.nil? || fetmailalias.empty?) ? short.to_s + "@fet.at" : fetmailalias.to_s + "@fet.at"

1
app/models/gremium.rb
View File

@@ -17,6 +17,7 @@ class Gremium < ActiveRecord::Base
ART2FALL={0=>"des", 1=>"des",2=>"der"} # Artikel 2.Fall abhängig vom Geschlecht
attr_accessible :desc, :name, :typ, :geschlecht,:thema_id, :memberships_attributes
has_many :memberships # Mitgliedschaften bei dem Gremium
belongs_to :thema # Gehört zu einem Thema
scope :tabs, -> { where(:typ => [1,3]).order(:typ).order(:name) } # Gremien die in Tabs angezeigt werden (Alle Anderen nur in der Liste
# Gremium im 2. Fall für die Konstruktion "Mitglied des ... / der ... "