Download as
Browse Code »

Commit 55c79e0ce0e931758addd3f883fc42588ddc13d9

Authored by Rodrigo Souto
1 parent 692325d6
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

Do not allow usp id as empty string

Showing 2 changed files with 11 additions and 0 deletions   Show diff stats
plugins/stoa/lib/ext/person.rb
  Diff comments   View file @55c79e0
@@ -5,6 +5,10 @@ class Person @@ -5,6 +5,10 @@ class Person
5 settings_items :invitation_code 5 settings_items :invitation_code
6 validate :usp_id_or_invitation, :if => lambda { |person| person.environment && person.environment.plugin_enabled?(StoaPlugin)} 6 validate :usp_id_or_invitation, :if => lambda { |person| person.environment && person.environment.plugin_enabled?(StoaPlugin)}
7 7
  8 + before_validation do |person|
  9 + person.usp_id = nil if person.usp_id.blank?
  10 + end
  11 +
8 def usp_id_or_invitation 12 def usp_id_or_invitation
9 if usp_id.blank? && (invitation_code.blank? || !invitation_task) 13 if usp_id.blank? && (invitation_code.blank? || !invitation_task)
10 errors.add(:usp_id, "can't register without usp_id or a valid invitation code") 14 errors.add(:usp_id, "can't register without usp_id or a valid invitation code")
plugins/stoa/test/unit/person_test.rb
  Diff comments   View file @55c79e0
@@ -18,6 +18,13 @@ class StoaPlugin::Person < ActiveSupport::TestCase @@ -18,6 +18,13 @@ class StoaPlugin::Person < ActiveSupport::TestCase
18 assert another_person.errors.invalid?(:usp_id) 18 assert another_person.errors.invalid?(:usp_id)
19 end 19 end
20 20
  21 + should 'not allow usp_id as an empty string' do
  22 + person = Person.new(:usp_id => '')
  23 + person.valid?
  24 +
  25 + assert_nil person.usp_id
  26 + end
  27 +
21 should 'allow nil usp_id only if person has an invitation_code' do 28 should 'allow nil usp_id only if person has an invitation_code' do
22 person = Person.new(:environment => environment) 29 person = Person.new(:environment => environment)
23 person.valid? 30 person.valid?