Merge pull request #1 from pfadipatria/StandardFeldZuweisung

Standard feld zuweisung
pfadipatria · Apr 17, 2015 · a37fb16 · a37fb16
2 parents 795f36a + cc243b0
commit a37fb16
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/app/models/pbs/person.rb b/app/models/pbs/person.rb
@@ -72,6 +72,16 @@ module Pbs::Person
               timeliness: { type: :date, allow_blank: true }
 
     alias_method_chain :full_name, :title
+
+    after_initialize :defaults, unless: :persisted?
+    # ":if => :new_record?" is equivalent in this context
+
+  end
+
+  def defaults
+    self.country = "Schweiz"
+    self.salutation = "lieber_pfadiname"
+    self.correspondence_language = "de"
   end
 
   def salutation_label

diff --git a/app/views/people/_fields_pbs.html.haml b/app/views/people/_fields_pbs.html.haml
@@ -5,12 +5,12 @@
 
 = field_set_tag do
   = f.labeled_input_field :title
-  = f.labeled_collection_select :salutation, Salutation.available, :first, :last, { include_blank: true }, class: 'span6'
+  = f.labeled_collection_select :salutation, Salutation.available, :first, :last, { include_blank: false }, class: 'span6'
   = f.labeled_collection_select(:correspondence_language,
                                 Settings.application.languages.to_hash,
                                 :first,
                                 :last,
-                                { prompt: true },
+                                { prompt: false },
                                 class: 'span6')
   = f.labeled_input_field :j_s_number
   = f.labeled_input_field :grade_of_school, help_inline: t('.non_automatic_field')

diff --git a/config/locales/models.pbs.de.yml b/config/locales/models.pbs.de.yml
@@ -15,7 +15,7 @@ de:
         other: APVs
       group/corps:
         one: Corps
-        other: Corps 
+        other: Corps
       group/abteilung:
         one: Abteilung
         other: Abteilungen
@@ -74,7 +74,7 @@ de:
       group/woelfe:
         one: Wölfe
         other: Wölfe
-        
+
       group/apv/präsident_apv:
         one: Präsident APV
         description:
@@ -87,7 +87,7 @@ de:
       group/apv/mitglied:
         one: Mitglied
         description:
-        
+
       group/corps/corpsleitung:
         one: Corpsleiter
         description:
@@ -97,7 +97,7 @@ de:
       group/corps/mitglied_corpsrat:
         one: Corpsrat
         description:
-           
+
       group/bund/mitarbeiter_gs:
         one: Mitarbeiter GS
         description: