Download as
Browse Code »

Commit eb5062af395e4542bcde7379879e5db9b5107f5f

Authored by Ana Losnak
Committed by Rodrigo Souto
1 parent 673c506c
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

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
Showing 6 changed files with 36 additions and 2 deletions   Show diff stats
app/helpers/profile_helper.rb
  Diff comments   View file @eb5062a
... ... @@ -20,10 +20,12 @@ module ProfileHelper
20 20 zip = display_field(_('ZIP code:'), profile, :zip_code)
21 21 phone = display_field(_('Contact phone:'), profile, :contact_phone)
22 22 email = display_field(_('e-Mail:'), profile, :email) { |email| link_to_email(email) }
23   - if address.blank? && zip.blank? && phone.blank? && email.blank?
  23 + personal_website = display_field(_('Personal website:'), profile, :personal_website)
  24 + jabber = display_field(_('Jabber:'), profile, :jabber_id)
  25 + if address.blank? && zip.blank? && phone.blank? && email.blank? && personal_website.blank? && jabber.blank?
24 26 ''
25 27 else
26   - content_tag('tr', content_tag('th', _('Contact'), { :colspan => 2 })) + address + zip + phone + email
  28 + content_tag('tr', content_tag('th', _('Contact'), { :colspan => 2 })) + address + zip + phone + email + personal_website + jabber
27 29 end
28 30 end
29 31  
... ...
app/models/person.rb
  Diff comments   View file @eb5062a
... ... @@ -157,6 +157,8 @@ class Person &lt; Profile
157 157 birth_date
158 158 cell_phone
159 159 comercial_phone
  160 + jabber_id
  161 + personal_website
160 162 schooling
161 163 professional_activity
162 164 organization
... ...
app/views/profile_editor/_person_form.rhtml
  Diff comments   View file @eb5062a
... ... @@ -13,6 +13,8 @@
13 13 <%= optional_field(@person, 'contact_phone', labelled_form_field(_('Home phone'), text_field(:profile_data, :contact_phone, :rel => _('Contact phone')))) %>
14 14 <%= optional_field(@person, 'cell_phone', f.text_field(:cell_phone, :rel => _('Cell phone'))) %>
15 15 <%= optional_field(@person, 'comercial_phone', f.text_field(:comercial_phone, :rel => _('Comercial phone'))) %>
  16 +<%= optional_field(@person, 'jabber_id', f.text_field(:jabber_id, :rel => _('Jabber'))) %>
  17 +<%= optional_field(@person, 'personal_website', f.text_field(:personal_website, :rel => _('Personal website'))) %>
16 18 <%= optional_field(@person, 'sex', f.radio_group(:profile_data, :sex, [ ['male',_('Male')], ['female',_('Female')] ])) %>
17 19 <%= 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>')) %>
18 20 <%= optional_field(@person, 'nationality', f.text_field(:nationality, :rel => _('Nationality'))) %>
... ...
db/migrate/20130801182659_add_extra_fields_for_person.rb 0 → 100644
  Diff comments   View file @eb5062a
... ... @@ -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
... ...
db/schema.rb
  Diff comments   View file @eb5062a
... ... @@ -468,6 +468,8 @@ ActiveRecord::Schema.define(:version =&gt; 20140108132730) do
468 468 t.boolean "is_template", :default => false
469 469 t.integer "template_id"
470 470 t.string "redirection_after_login"
  471 + t.string "personal_website"
  472 + t.string "jabber_id"
471 473 end
472 474  
473 475 add_index "profiles", ["environment_id"], :name => "index_profiles_on_environment_id"
... ...
test/unit/person_test.rb
  Diff comments   View file @eb5062a
... ... @@ -1446,4 +1446,19 @@ class PersonTest &lt; ActiveSupport::TestCase
1446 1446 assert 3, original_person.memberships.count
1447 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 1464 end
... ...