Download as
Browse Code »

Commit 73926c55b90786cd3396b20d28bf67025e44db89

Authored by JoenioCosta
1 parent 88057aef
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

ActionItem345: remove term 'Category:' from product info's 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1768 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 11 additions and 3 deletions   Show diff stats
app/views/search/_product.rhtml
  Diff comments   View file @73926c5
@@ -2,8 +2,7 @@ @@ -2,8 +2,7 @@
2 2
3 <li> 3 <li>
4 <%= link_to_product product, :class => 'product-pic', :style => 'background-image:url(%s)' % 4 <%= link_to_product product, :class => 'product-pic', :style => 'background-image:url(%s)' %
5 - ( product.image ? product.image.public_filename(:minor) :  
6 - '/images/icons-app/product-default-pic-minor.png' ) %> 5 + ( product.image ? product.image.public_filename(:minor) : '/images/icons-app/product-default-pic-minor.png' ) %>
7 <strong> 6 <strong>
8 <%= link_to_product product %> 7 <%= link_to_product product %>
9 </strong> 8 </strong>
@@ -12,6 +11,6 @@ @@ -12,6 +11,6 @@
12 <% if product.enterprise %> 11 <% if product.enterprise %>
13 <li> <%= _('Suplier: %s') % link_to_homepage(product.enterprise.name, product.enterprise.identifier) %> </li> 12 <li> <%= _('Suplier: %s') % link_to_homepage(product.enterprise.name, product.enterprise.identifier) %> </li>
14 <% end %> 13 <% end %>
15 - <li> <%= _('Category: %s') % link_to_category(product.product_category) %> </li> 14 + <li> <%= link_to_category(product.product_category) %> </li>
16 </ul> 15 </ul>
17 </li> 16 </li>
test/functional/search_controller_test.rb
  Diff comments   View file @73926c5
@@ -748,4 +748,13 @@ class SearchControllerTest &lt; Test::Unit::TestCase @@ -748,4 +748,13 @@ class SearchControllerTest &lt; Test::Unit::TestCase
748 assert_not_includes assigns(:results)[:comments], comment4 748 assert_not_includes assigns(:results)[:comments], comment4
749 end 749 end
750 750
  751 + should 'not show term "Category:" before product category' do
  752 + Profile.delete_all
  753 + ent = Enterprise.create!(:name => 'teste1', :identifier => 'teste1')
  754 + prod1 = ent.products.create!(:name => 'a beautiful product')
  755 + prod2 = ent.products.create!(:name => 'another beautiful product')
  756 + get :assets, :asset => 'products'
  757 + assert_no_match /Category:/, @response.body
  758 + end
  759 +
751 end 760 end