Download as
Browse Code »

Commit fe0c4489ca34879745fc4bb504f50f1b0c258aa0

Authored by Daniela Feitosa
Committed by Joenio Costa
1 parent bdef49f5
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

Not displaying description if it is blank 

(ActionItem1547)
Showing 2 changed files with 19 additions and 6 deletions   Show diff stats
app/views/profile/index.rhtml
  Diff comments   View file @fe0c448
@@ -4,12 +4,12 @@ @@ -4,12 +4,12 @@
4 4
5 <% if @action %> 5 <% if @action %>
6 <%= render :partial => 'private_profile' %> 6 <%= render :partial => 'private_profile' %>
7 -<% end %>  
8 -  
9 -<% if !@action %>  
10 - <div class='public-profile-description'>  
11 - <%= profile.description %>  
12 - </div> 7 +<% else %>
  8 + <% unless profile.description.blank? %>
  9 + <div class='public-profile-description'>
  10 + <%= profile.description %>
  11 + </div>
  12 + <% end %>
13 <% end %> 13 <% end %>
14 14
15 <table class='profile'> 15 <table class='profile'>
test/functional/profile_controller_test.rb
  Diff comments   View file @fe0c448
@@ -683,6 +683,19 @@ class ProfileControllerTest &lt; Test::Unit::TestCase @@ -683,6 +683,19 @@ class ProfileControllerTest &lt; Test::Unit::TestCase
683 assert_tag :tag => 'div', :attributes => { :class => 'public-profile-description' }, :content => /Person\'s description/ 683 assert_tag :tag => 'div', :attributes => { :class => 'public-profile-description' }, :content => /Person\'s description/
684 end 684 end
685 685
  686 + should 'not show description of orgarnization if not filled' do
  687 + login_as(@profile.identifier)
  688 + ent = fast_create(Enterprise)
  689 + get :index, :profile => ent.identifier
  690 + assert_no_tag :tag => 'div', :attributes => { :class => 'public-profile-description' }
  691 + end
  692 +
  693 + should 'not show description of person if not filled' do
  694 + login_as(@profile.identifier)
  695 + get :index, :profile => @profile.identifier
  696 + assert_no_tag :tag => 'div', :attributes => { :class => 'public-profile-description' }
  697 + end
  698 +
686 should 'ask for login if user not logged' do 699 should 'ask for login if user not logged' do
687 enterprise = fast_create(Enterprise) 700 enterprise = fast_create(Enterprise)
688 get :unblock, :profile => enterprise.identifier 701 get :unblock, :profile => enterprise.identifier