Download as
Browse Code »

Commit 4dcb9b6e35bbe2e478f14a82e82af26e32ad43b2

Authored by Antonio Terceiro
1 parent 6c2bf00e
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

ActionItem942: force display of mandatory fields on signup

Showing 2 changed files with 16 additions and 1 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @4dcb9b6
@@ -686,7 +686,7 @@ module ApplicationHelper @@ -686,7 +686,7 @@ module ApplicationHelper
686 field_html += capture(&block) 686 field_html += capture(&block)
687 end 687 end
688 if (controller.action_name == 'signup') 688 if (controller.action_name == 'signup')
689 - if profile.signup_fields.include?(name) 689 + if profile.signup_fields.include?(name) || profile.required_fields.include?(name)
690 result = field_html 690 result = field_html
691 end 691 end
692 else 692 else
test/unit/application_helper_test.rb
  Diff comments   View file @4dcb9b6
@@ -332,6 +332,21 @@ class ApplicationHelperTest < Test::Unit::TestCase @@ -332,6 +332,21 @@ class ApplicationHelperTest < Test::Unit::TestCase
332 assert_equal '<span>SIGNUP_FIELD</span>', optional_field(profile, 'field', 'SIGNUP_FIELD') 332 assert_equal '<span>SIGNUP_FIELD</span>', optional_field(profile, 'field', 'SIGNUP_FIELD')
333 end 333 end
334 334
  335 + should 'display required fields on signup even if admin did not marked field to show up in signup' do
  336 + env = Environment.create!(:name => 'env test')
  337 + stubs(:environment).returns(env)
  338 +
  339 + controller = mock
  340 + stubs(:controller).returns(controller)
  341 + controller.expects(:action_name).returns('signup')
  342 +
  343 + stubs(:required).with('SIGNUP_FIELD').returns('<span>SIGNUP_FIELD</span>')
  344 + profile = Person.new
  345 + profile.stubs(:required_fields).returns(['field'])
  346 + profile.stubs(:signup_fields).returns([])
  347 + assert_equal '<span>SIGNUP_FIELD</span>', optional_field(profile, 'field', 'SIGNUP_FIELD')
  348 + end
  349 +
335 should 'not ask_to_join unless profile defined' do 350 should 'not ask_to_join unless profile defined' do
336 e = Environment.default 351 e = Environment.default
337 e.stubs(:enabled?).with(:disable_join_community_popup).returns(false) 352 e.stubs(:enabled?).with(:disable_join_community_popup).returns(false)