Completed salutation implementation in core

hitobito · Apr 5, 2023 · 11df87f · 11df87f
1 parent 451a6ab
commit 11df87f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/app/views/people/_details_generic.html.haml b/app/views/people/_details_generic.html.haml
@@ -1,2 +1,2 @@
-= render_attrs(entry, :title, :nationality, :correspondence_language, :additional_languages, :advertising)
+= render_attrs(entry, :nationality, :correspondence_language, :additional_languages, :advertising)
 
diff --git a/app/views/people/_fields_generic.html.haml b/app/views/people/_fields_generic.html.haml
@@ -6,9 +6,6 @@
 - #  https://github.com/hitobito/hitobito_generic.
 
 = field_set_tag do
-  = f.labeled_input_field :title,
-                          data: { provide: :typeahead, source: @titles }
-
   = f.labeled_input_field :nationality,
                           data: { provide: :typeahead, source: @nationalities }
 

diff --git a/db/migrate/20190902090751_add_person_fields.rb b/db/migrate/20190902090751_add_person_fields.rb
@@ -7,7 +7,9 @@
 
 class AddPersonFields < ActiveRecord::Migration[4.2]
   def change
-    add_column(:people, :title, :string)
+    if not ActiveRecord::Base.connection.column_exists?(:people, :title)
+      add_column(:people, :title, :string)
+    end
     add_column(:people, :nationality, :string)
     add_column(:people, :correspondence_language, :string)
     add_column(:people, :additional_languages, :string)
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@
		= render_attrs(entry, :title, :nationality, :correspondence_language, :additional_languages, :advertising)
		= render_attrs(entry, :nationality, :correspondence_language, :additional_languages, :advertising)