Download as
Browse Code »

Commit 977f0f9a924042b0ee050ecc773c0a57f3d0f7aa

Authored by JoenioCosta
1 parent 02e7c2c1
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem380: added more fields to edit person info 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1807 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 3 changed files with 7 additions and 4 deletions   Show diff stats
app/models/person.rb
  Diff comments   View file @977f0f9
@@ -25,7 +25,7 @@ class Person < Profile @@ -25,7 +25,7 @@ class Person < Profile
25 settings_items :photo, :contact_information, :birth_date, :sex, :city, :state, :country 25 settings_items :photo, :contact_information, :birth_date, :sex, :city, :state, :country
26 26
27 def summary 27 def summary
28 - ['name', 'contact_information', 'sex', 'birth_date', 'address', 'city', 'state', 'country'].map do |col| 28 + ['name', 'contact_information', 'contact_phone', 'sex', 'birth_date', 'address', 'city', 'state', 'country'].map do |col|
29 [ col.humanize, self.send(col) ] 29 [ col.humanize, self.send(col) ]
30 end 30 end
31 end 31 end
app/views/profile_editor/person.rhtml
  Diff comments   View file @977f0f9
@@ -2,18 +2,21 @@ @@ -2,18 +2,21 @@
2 2
3 <%= error_messages_for :profile %> 3 <%= error_messages_for :profile %>
4 4
5 -<% labelled_form_for :profile, @profile do |f| %> 5 +<% labelled_form_for :profile_data, @profile do |f| %>
6 <%= f.text_field(:name) %> 6 <%= f.text_field(:name) %>
  7 + <%= f.text_field(:contact_information) %>
  8 + <%= f.text_field(:contact_phone) %>
7 <%= _('Sex: ') %> 9 <%= _('Sex: ') %>
8 <%= display_form_field(_('Male'), radio_button(:profile, :sex, 'male')) %> 10 <%= display_form_field(_('Male'), radio_button(:profile, :sex, 'male')) %>
9 <%= display_form_field(_('Female'), radio_button(:profile, :sex, 'female')) %> 11 <%= display_form_field(_('Female'), radio_button(:profile, :sex, 'female')) %>
  12 + <%= f.text_field(:birth_date) %>
  13 + <%= f.text_field(:address) %>
10 <%= f.text_field(:city) %> 14 <%= f.text_field(:city) %>
11 <%= f.text_field(:state) %> 15 <%= f.text_field(:state) %>
12 <%= f.text_field(:country) %> 16 <%= f.text_field(:country) %>
13 <% button_bar do %> 17 <% button_bar do %>
14 <%= submit_button('save', _('Save'), :cancel => {:action => 'index'}) %> 18 <%= submit_button('save', _('Save'), :cancel => {:action => 'index'}) %>
15 <% end %> 19 <% end %>
16 -  
17 <% end %> 20 <% end %>
18 21
19 <%# = generate_form :info, @info, {...} %> 22 <%# = generate_form :info, @info, {...} %>
test/functional/profile_editor_controller_test.rb
  Diff comments   View file @977f0f9
@@ -193,7 +193,7 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase @@ -193,7 +193,7 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase
193 should 'display profile publication option in edit profile screen' do 193 should 'display profile publication option in edit profile screen' do
194 profile = Profile['ze'] 194 profile = Profile['ze']
195 get :edit, :profile => 'ze' 195 get :edit, :profile => 'ze'
196 - assert_tag :tag => 'input', :attributes => { :type => 'checkbox', :checked => 'checked', :name => 'profile_data[public_profile]', :value => 'true' } 196 + assert_tag :tag => 'input', :attributes => { :type => 'checkbox', :checked => 'checked', :name => 'profile_data[public_profile]', :value => 'true' }
197 assert_tag :tag => 'input', :attributes => { :type => 'hidden', :name => 'profile_data[public_profile]', :value => false } 197 assert_tag :tag => 'input', :attributes => { :type => 'hidden', :name => 'profile_data[public_profile]', :value => false }
198 end 198 end
199 199