Download as
Browse Code »

Commit 2b0bde99958f29f727a7a6d23017a9813a5eb7c0

Authored by Rodrigo Souto
2 parents 4a5cdce6 2e1d108e
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

Merge branch 'ai3067' into 'stable' 

Prefix missing partials on manage_products

http://noosfero.org/Development/ActionItem3067
Showing 4 changed files with 5 additions and 5 deletions   Show diff stats
app/views/manage_products/_display_inputs.rhtml
  Diff comments   View file @2b0bde9
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 20
21 <div id='display-product-inputs'> 21 <div id='display-product-inputs'>
22 <ul class='input-list'> 22 <ul class='input-list'>
23 - <%= render :partial => 'input', :collection => @inputs %> 23 + <%= render :partial => 'manage_products/input', :collection => @inputs %>
24 </ul> 24 </ul>
25 <%= edit_link(_('Order inputs'), {:action => 'order_inputs', :id => @product.id}, :class => "order-inputs", :style => 'display:none') %> 25 <%= edit_link(_('Order inputs'), {:action => 'order_inputs', :id => @product.id}, :class => "order-inputs", :style => 'display:none') %>
26 </div> 26 </div>
app/views/manage_products/_input.rhtml
  Diff comments   View file @2b0bde9
1 <li class='input-item' id="input-<%= input.id %>"> 1 <li class='input-item' id="input-<%= input.id %>">
2 -<%= render :partial => 'display_input', :locals =>{:input => input} %> 2 +<%= render :partial => 'manage_products/display_input', :locals =>{:input => input} %>
3 </li> 3 </li>
app/views/manage_products/_manage_product_details.rhtml
  Diff comments   View file @2b0bde9
1 <div id='price-composition-bar'> 1 <div id='price-composition-bar'>
2 - <%= render :partial => 'price_composition_bar' %> 2 + <%= render :partial => 'manage_products/price_composition_bar' %>
3 </div> 3 </div>
4 4
5 <% form_tag({:action => 'manage_product_details'}, :method => 'post', :id => 'manage-product-details-form') do %> 5 <% form_tag({:action => 'manage_product_details'}, :method => 'post', :id => 'manage-product-details-form') do %>
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 <small><%= _('This value is composed by the total value of registered inputs') %></small> 14 <small><%= _('This value is composed by the total value of registered inputs') %></small>
15 </td> 15 </td>
16 </tr> 16 </tr>
17 - <%= render :partial => 'edit_price_details', :locals => {:price_details => @product.price_details} %> 17 + <%= render :partial => 'manage_products/edit_price_details', :locals => {:price_details => @product.price_details} %>
18 </table> 18 </table>
19 </div> 19 </div>
20 20
app/views/manage_products/edit.rhtml
  Diff comments   View file @2b0bde9
1 <h2> <%= _('Editing') %> <%= @product.name %> </h2> 1 <h2> <%= _('Editing') %> <%= @product.name %> </h2>
2 2
3 -<%= render :partial => 'form', :locals => {:mode => 'edit'} %> 3 +<%= render :partial => 'manage_products/form', :locals => {:mode => 'edit'} %>