Download as
Browse Code »

Commit 0d33fd94abb596117a38fc30516c7604230cc2ed

Authored by Rafael Martins
1 parent 424b795e
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

Fixed a problem with inputs expand-box on catalog 

* The inputs expand-box must appear even if the inputs are not completely
filled.
Showing 2 changed files with 35 additions and 2 deletions   Show diff stats
app/views/catalog/index.rhtml
  Diff comments   View file @0d33fd9
@@ -62,13 +62,14 @@ @@ -62,13 +62,14 @@
62 </li> 62 </li>
63 <% end %> 63 <% end %>
64 64
65 - <% if product.any_inputs_details? %> 65 + <% if product.inputs.count > 0 %>
66 <li class="product-inputs expand-box"> 66 <li class="product-inputs expand-box">
67 <span id="inputs-button"><%= _('inputs and raw materials') %></span> 67 <span id="inputs-button"><%= _('inputs and raw materials') %></span>
68 <div class="arrow"></div> 68 <div class="arrow"></div>
69 <div class="content" id="inputs-description"> 69 <div class="content" id="inputs-description">
70 <% product.inputs.each do |i| %> 70 <% product.inputs.each do |i| %>
71 - <div><%= "#{i.amount_used} #{i.unit.singular} #{_('of')} #{i.product_category.name}" if i.has_all_price_details? %></div> 71 + <div><%= "#{i.amount_used} #{i.unit.singular} #{_('of')} " if i.has_all_price_details? %>
  72 + <%= "#{i.product_category.name}" %></div>
72 <% end %> 73 <% end %>
73 </div> 74 </div>
74 </li> 75 </li>
features/browse_catalogs.feature
  Diff comments   View file @0d33fd9
@@ -149,6 +149,19 @@ Feature: browse catalogs @@ -149,6 +149,19 @@ Feature: browse catalogs
149 Then I should see "A small description" within "#product-description" 149 Then I should see "A small description" within "#product-description"
150 And the "product-description" should be visible 150 And the "product-description" should be visible
151 151
  152 + @selenium
  153 + Scenario: hide description
  154 + Given the following products
  155 + | owner | category | name | price | description |
  156 + | artebonito | categ1 | Produto3 | 12.34 | A small description for a product that doesn't exist. |
  157 + And I am on /catalog/artebonito
  158 + And I reload and wait for the page
  159 + When I click "product-description-button"
  160 + Then I should see "A small description" within "#product-description"
  161 + And the "product-description" should be visible
  162 + When I click "product-description-button"
  163 + Then the "product-description" should not be visible
  164 +
152 Scenario: display unavailable product 165 Scenario: display unavailable product
153 Given the following products 166 Given the following products
154 | owner | category | name | price | available | 167 | owner | category | name | price | available |
@@ -248,3 +261,22 @@ Feature: browse catalogs @@ -248,3 +261,22 @@ Feature: browse catalogs
248 When I click "#inputs-button" 261 When I click "#inputs-button"
249 Then the "#inputs-description" should be visible 262 Then the "#inputs-description" should be visible
250 And I should see "7.0 Liter of food" within "#inputs-description" 263 And I should see "7.0 Liter of food" within "#inputs-description"
  264 +
  265 + @selenium
  266 + Scenario: hide inputs and raw materials
  267 + Given the following product
  268 + | owner | category | name | price |
  269 + | artebonito | food | Vitamina | 17.99 |
  270 + And the following unit
  271 + | name | plural |
  272 + | Liter | Liters |
  273 + And the following input
  274 + | product | category | price_per_unit | amount_used | unit |
  275 + | Vitamina | food | 1.45 | 7 | Liter |
  276 + And I am on /catalog/artebonito
  277 + And I reload and wait for the page
  278 + When I click "#inputs-button"
  279 + Then the "#inputs-description" should be visible
  280 + And I should see "7.0 Liter of food" within "#inputs-description"
  281 + When I click "#inputs-button"
  282 + Then the "#inputs-description" should not be visible