Download as
Browse Code »

Commit 22235d76bf9b1c6ae51f580dffb22703ff6ad318

Authored by AntonioTerceiro
1 parent 31849db7
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

ActionItem295: editing public_content 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1828 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 24 additions and 0 deletions   Show diff stats
app/views/profile_editor/edit.rhtml
  Diff comments   View file @22235d7
@@ -20,6 +20,15 @@ @@ -20,6 +20,15 @@
20 <%= radio_button 'profile_data', 'public_profile', 'false' %> 20 <%= radio_button 'profile_data', 'public_profile', 'false' %>
21 </div> 21 </div>
22 </p> 22 </p>
  23 + <p>
  24 + <%= _("This profile's content is:") %>
  25 + <div>
  26 + <%= radio_button 'profile_data', 'public_content', 'true' %>
  27 + </div>
  28 + <div>
  29 + <%= radio_button 'profile_data', 'public_content', 'false' %>
  30 + </div>
  31 + </p>
23 32
24 <%= select_categories(:profile_data, _('Select the categories of your interest'), 1) %> 33 <%= select_categories(:profile_data, _('Select the categories of your interest'), 1) %>
25 34
test/functional/profile_editor_controller_test.rb
  Diff comments   View file @22235d7
@@ -205,6 +205,21 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase @@ -205,6 +205,21 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase
205 assert_equal false, Profile['ze'].public_profile 205 assert_equal false, Profile['ze'].public_profile
206 end 206 end
207 207
  208 + should 'display public_content field for editing' do
  209 + profile = Profile['ze']
  210 + get :edit, :profile => 'ze'
  211 + assert_tag :tag => 'input', :attributes => { :type => 'radio', :checked => 'checked', :name => 'profile_data[public_content]', :value => 'true' }
  212 + assert_tag :tag => 'input', :attributes => { :type => 'radio', :name => 'profile_data[public_content]', :value => 'false' }
  213 + end
  214 +
  215 + should 'display properly that the content is non-public' do
  216 + profile = Profile['ze']
  217 + profile.update_attributes(:public_content => false)
  218 + get :edit, :profile => 'ze'
  219 + assert_tag :tag => 'input', :attributes => { :type => 'radio', :checked => 'checked', :name => 'profile_data[public_content]', :value => 'false' }
  220 + assert_tag :tag => 'input', :attributes => { :type => 'radio', :name => 'profile_data[public_content]', :value => 'true' }
  221 + end
  222 +
208 should 'show error messages for invalid foundation_year' do 223 should 'show error messages for invalid foundation_year' do
209 org = Organization.create!(:name => 'test org', :identifier => 'testorg') 224 org = Organization.create!(:name => 'test org', :identifier => 'testorg')
210 post :edit, :profile => 'testorg', :profile_data => { :foundation_year => 'aaa' } 225 post :edit, :profile => 'testorg', :profile_data => { :foundation_year => 'aaa' }