Download as
Browse Code »

Commit 4a0ec8b5e177042a1bfcaba068e4e1118705a1da

Authored by Rodrigo Souto
Committed by Daniela Feitosa
1 parent 610e3552
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

Fix usp_id match

Showing 2 changed files with 6 additions and 2 deletions   Show diff stats
plugins/stoa/lib/stoa_plugin.rb
  Diff comments   View file @4a0ec8b
@@ -60,12 +60,14 @@ class StoaPlugin < Noosfero::Plugin @@ -60,12 +60,14 @@ class StoaPlugin < Noosfero::Plugin
60 end 60 end
61 61
62 def account_controller_filters 62 def account_controller_filters
  63 + environment = context.environment
63 block = lambda do 64 block = lambda do
64 params[:profile_data] ||= {} 65 params[:profile_data] ||= {}
65 params[:profile_data][:invitation_code] = params[:invitation_code] 66 params[:profile_data][:invitation_code] = params[:invitation_code]
  67 + invitation = Task.pending.find(:first, :conditions => {:code => params[:invitation_code]})
66 if request.post? 68 if request.post?
67 - if !params[:invitation_code] && !StoaPlugin::UspUser.matches?(params[:profile_data][:usp_id], params[:confirmation_field], params[params[:confirmation_field]])  
68 - @person = Person.new 69 + if !invitation && !StoaPlugin::UspUser.matches?(params[:profile_data][:usp_id], params[:confirmation_field], params[params[:confirmation_field]])
  70 + @person = Person.new(:environment => environment)
69 @person.errors.add(:usp_id, _(' validation failed')) 71 @person.errors.add(:usp_id, _(' validation failed'))
70 render :action => :signup 72 render :action => :signup
71 end 73 end
plugins/stoa/lib/stoa_plugin/usp_user.rb
  Diff comments   View file @4a0ec8b
@@ -13,6 +13,8 @@ class StoaPlugin::UspUser < ActiveRecord::Base @@ -13,6 +13,8 @@ class StoaPlugin::UspUser < ActiveRecord::Base
13 end 13 end
14 14
15 def self.matches?(usp_id, field, value) 15 def self.matches?(usp_id, field, value)
  16 + usp_id.gsub!(/[.-]/,'')
  17 + value.gsub!(/[.-]/,'')
16 user = StoaPlugin::UspUser.find_by_codpes(usp_id.to_i) 18 user = StoaPlugin::UspUser.find_by_codpes(usp_id.to_i)
17 return false if user.nil? || !user.respond_to?(field) || value.blank? 19 return false if user.nil? || !user.respond_to?(field) || value.blank?
18 case field.to_sym 20 case field.to_sym