Download as
Browse Code »

Commit 1ee26ba69d21f3897d277a6fb96d6d31bb3147c3

Authored by Daniela Feitosa
1 parent e46180a8
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

ActionItem833: fixing: not display variables on footer when it is blank

Showing 2 changed files with 6 additions and 2 deletions   Show diff stats
app/models/profile.rb
  Diff comments   View file @1ee26ba
@@ -469,9 +469,9 @@ class Profile < ActiveRecord::Base @@ -469,9 +469,9 @@ class Profile < ActiveRecord::Base
469 def custom_footer 469 def custom_footer
470 footer = self[:custom_footer] || environment.custom_footer 470 footer = self[:custom_footer] || environment.custom_footer
471 if footer 471 if footer
472 - %w[contact_person contact_email contact_phone location address economic_activity].each do |att| 472 + %w[contact_person contact_email contact_phone location address economic_activity city state country zip_code].each do |att|
473 if self.respond_to?(att) && footer.match(/\{[^{]*#{att}\}/) 473 if self.respond_to?(att) && footer.match(/\{[^{]*#{att}\}/)
474 - if !self.send(att).nil? 474 + if !self.send(att).nil? && !self.send(att).blank?
475 footer = footer.gsub(/\{([^{]*)#{att}\}/, '\1' + self.send(att)) 475 footer = footer.gsub(/\{([^{]*)#{att}\}/, '\1' + self.send(att))
476 else 476 else
477 footer = footer.gsub(/\{[^}]*#{att}\}/, '') 477 footer = footer.gsub(/\{[^}]*#{att}\}/, '')
test/unit/profile_test.rb
  Diff comments   View file @1ee26ba
@@ -791,6 +791,10 @@ class ProfileTest < Test::Unit::TestCase @@ -791,6 +791,10 @@ class ProfileTest < Test::Unit::TestCase
791 assert_equal '', Profile.new(:custom_footer => '{address}').custom_footer 791 assert_equal '', Profile.new(:custom_footer => '{address}').custom_footer
792 end 792 end
793 793
  794 + should 'replace variables on custom_footer when it is blank' do
  795 + assert_equal '', Enterprise.new(:custom_footer => '{ZIP Code: zip_code}', :zip_code => '').custom_footer
  796 + end
  797 +
794 should 'replace variables in custom_footer when more than one' do 798 should 'replace variables in custom_footer when more than one' do
795 assert_equal 'Phone: 9999999', Profile.new(:custom_footer => '{Address: address}{Phone: contact_phone}', :contact_phone => '9999999').custom_footer 799 assert_equal 'Phone: 9999999', Profile.new(:custom_footer => '{Address: address}{Phone: contact_phone}', :contact_phone => '9999999').custom_footer
796 end 800 end