profile_editor: add extra optional fields for person

Signed-off-by: Ana Losnak <analosnak@gmail.com> Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com> ActionItem1011

profile_editor: add extra optional fields for person
Signed-off-by: Ana Losnak <analosnak@gmail.com> Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com> ActionItem1011
Ana Losnak · Rodrigo Souto
1 parent 673c506c
Showing 6 changed files with 36 additions and 2 deletions Show diff stats
app/helpers/profile_helper.rb
app/models/person.rb
app/views/profile_editor/_person_form.rhtml
db/migrate/20130801182659_add_extra_fields_for_person.rb
db/schema.rb
test/unit/person_test.rb
@@ -20,10 +20,12 @@ module ProfileHelper
     zip = display_field(_('ZIP code:'), profile, :zip_code)
     phone = display_field(_('Contact phone:'), profile, :contact_phone)
     email = display_field(_('e-Mail:'), profile, :email) { |email| link_to_email(email) }
-    if address.blank? && zip.blank? && phone.blank? && email.blank?
+    personal_website = display_field(_('Personal website:'), profile, :personal_website)
+    jabber = display_field(_('Jabber:'), profile, :jabber_id)
+    if address.blank? && zip.blank? && phone.blank? && email.blank? && personal_website.blank? && jabber.blank?
       ''
     else
-      content_tag('tr', content_tag('th', _('Contact'), { :colspan => 2 })) + address + zip + phone + email
+      content_tag('tr', content_tag('th', _('Contact'), { :colspan => 2 })) + address + zip + phone + email + personal_website + jabber
     end
   end
@@ -157,6 +157,8 @@ class Person &lt; Profile
   birth_date
   cell_phone
   comercial_phone
+  jabber_id
+  personal_website
   schooling
   professional_activity
   organization
@@ -13,6 +13,8 @@
 <%= optional_field(@person, 'contact_phone', labelled_form_field(_('Home phone'), text_field(:profile_data, :contact_phone, :rel => _('Contact phone')))) %>
 <%= optional_field(@person, 'cell_phone', f.text_field(:cell_phone, :rel => _('Cell phone'))) %>
 <%= optional_field(@person, 'comercial_phone', f.text_field(:comercial_phone, :rel => _('Comercial phone'))) %>
+<%= optional_field(@person, 'jabber_id', f.text_field(:jabber_id, :rel => _('Jabber'))) %>
+<%= optional_field(@person, 'personal_website', f.text_field(:personal_website, :rel => _('Personal website'))) %>
 <%= optional_field(@person, 'sex', f.radio_group(:profile_data, :sex, [ ['male',_('Male')], ['female',_('Female')] ])) %>
 <%= optional_field(@person, 'birth_date', labelled_form_field(_('Birth date'), '<div class="select-birth-date">' + pick_date(:profile_data, :birth_date, {:start_year => (Date.today.year - 100), :end_year => (Date.today.year - 5)}) + '</div>')) %>
 <%= optional_field(@person, 'nationality', f.text_field(:nationality, :rel => _('Nationality'))) %>
@@ -0,0 +1,11 @@
+class AddExtraFieldsForPerson < ActiveRecord::Migration
+  def self.up
+    add_column :profiles, :personal_website, :string
+    add_column :profiles, :jabber_id, :string
+  end
+
+  def self.down
+    remove_column :profiles, :personal_website
+    remove_column :profiles, :jabber_id
+  end
+end
@@ -468,6 +468,8 @@ ActiveRecord::Schema.define(:version =&gt; 20140108132730) do
     t.boolean  "is_template",                           :default => false
     t.integer  "template_id"
     t.string   "redirection_after_login"
+    t.string   "personal_website"
+    t.string   "jabber_id"
   end
   add_index "profiles", ["environment_id"], :name => "index_profiles_on_environment_id"
@@ -1446,4 +1446,19 @@ class PersonTest &lt; ActiveSupport::TestCase
     assert 3, original_person.memberships.count
   end
+  should 'respond to extra fields' do
+    user = create_user('some-user').person
+
+    assert user.respond_to?(:personal_website)
+    assert user.respond_to?(:jabber_id)
+  end
+
+  should 'return extra fields when fields method is called' do
+    extra_fields = ['jabber_id', 'personal_website']
+
+    extra_fields.each do |field|
+      assert_includes Person.fields, field
+    end
+  end
+
 end
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+class AddExtraFieldsForPerson < ActiveRecord::Migration
	2	+ def self.up
	3	+ add_column :profiles, :personal_website, :string
	4	+ add_column :profiles, :jabber_id, :string
	5	+ end
	6	+
	7	+ def self.down
	8	+ remove_column :profiles, :personal_website
	9	+ remove_column :profiles, :jabber_id
	10	+ end
	11	+end
	@@ -1446,4 +1446,19 @@ class PersonTest < ActiveSupport::TestCase		@@ -1446,4 +1446,19 @@ class PersonTest < ActiveSupport::TestCase
1446	assert 3, original_person.memberships.count	1446	assert 3, original_person.memberships.count
1447	end	1447	end
1448		1448
		1449	+ should 'respond to extra fields' do
		1450	+ user = create_user('some-user').person
		1451	+
		1452	+ assert user.respond_to?(:personal_website)
		1453	+ assert user.respond_to?(:jabber_id)
		1454	+ end
		1455	+
		1456	+ should 'return extra fields when fields method is called' do
		1457	+ extra_fields = ['jabber_id', 'personal_website']
		1458	+
		1459	+ extra_fields.each do \|field\|
		1460	+ assert_includes Person.fields, field
		1461	+ end
		1462	+ end
		1463	+
1449	end	1464	end