Download as
Browse Code »

Commit 8f464d5c285b239b7111cb6da0cb5b29aa48dfad

Authored by JoenioCosta
1 parent 8838cfb0
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

ActionItem328: s/consumed products/raw materials/g 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1889 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 3 changed files with 13 additions and 6 deletions   Show diff stats
app/views/manage_products/index.rhtml
  Diff comments   View file @8f464d5
@@ -20,11 +20,11 @@ @@ -20,11 +20,11 @@
20 20
21 <p> <%= link_to _('New product or service'), :action => 'new' %> </p> 21 <p> <%= link_to _('New product or service'), :action => 'new' %> </p>
22 22
23 -<h3> <%=_('Listing consumed products') %> </h3> 23 +<h3> <%=_('Listing raw materials') %> </h3>
24 24
25 <table> 25 <table>
26 <tr> 26 <tr>
27 - <th><%= _('Consumed product') %></th> 27 + <th><%= _('Raw material') %></th>
28 <th><%= _('Actions') %></th> 28 <th><%= _('Actions') %></th>
29 </tr> 29 </tr>
30 <% @consumptions.each do |consumption| %> 30 <% @consumptions.each do |consumption| %>
@@ -36,12 +36,12 @@ @@ -36,12 +36,12 @@
36 </td> 36 </td>
37 <td> 37 <td>
38 <%= button :edit, _('Edit'), :action => 'edit_consumption', :id => consumption %> 38 <%= button :edit, _('Edit'), :action => 'edit_consumption', :id => consumption %>
39 - <%= button :delete, _('Remove'), { :action => 'destroy_consumption', :id => consumption }, :confirm => _('Are you sure, you want to remove this product from your list') %> 39 + <%= button :delete, _('Remove'), { :action => 'destroy_consumption', :id => consumption }, :confirm => _('Are you sure, you want to remove this raw material from your list') %>
40 </td> 40 </td>
41 </tr> 41 </tr>
42 <% end %> 42 <% end %>
43 </table> 43 </table>
44 44
45 -<p> <%= link_to _('Add cunsumed product'), :action => 'new_consumption' %> </p> 45 +<p> <%= link_to _('Add raw material'), :action => 'new_consumption' %> </p>
46 46
47 <%= link_to_myprofile(_('Back'), {}, @profile.identifier) %> 47 <%= link_to_myprofile(_('Back'), {}, @profile.identifier) %>
app/views/manage_products/new_consumption.rhtml
  Diff comments   View file @8f464d5
1 -<h2><%= _('Add consumed product') %></h2> 1 +<h2><%= _('Add raw material') %></h2>
2 2
3 <%= render :partial => 'form_consumption', :locals => {:action => 'new_consumption'} %> 3 <%= render :partial => 'form_consumption', :locals => {:action => 'new_consumption'} %>
test/functional/manage_products_controller_test.rb
  Diff comments   View file @8f464d5
@@ -200,7 +200,7 @@ class ManageProductsControllerTest &lt; Test::Unit::TestCase @@ -200,7 +200,7 @@ class ManageProductsControllerTest &lt; Test::Unit::TestCase
200 200
201 should 'display new consumption form' do 201 should 'display new consumption form' do
202 get :new_consumption, :profile => @enterprise.identifier 202 get :new_consumption, :profile => @enterprise.identifier
203 - assert_tag :tag => 'h2', :content => 'Add consumed product' 203 + assert_tag :tag => 'h2', :content => 'Add raw material'
204 end 204 end
205 205
206 should 'create consumption product' do 206 should 'create consumption product' do
@@ -246,4 +246,11 @@ class ManageProductsControllerTest &lt; Test::Unit::TestCase @@ -246,4 +246,11 @@ class ManageProductsControllerTest &lt; Test::Unit::TestCase
246 assert_equal 'new extra info', @enterprise.consumptions.find(product.reload.id).aditional_specifications 246 assert_equal 'new extra info', @enterprise.consumptions.find(product.reload.id).aditional_specifications
247 end 247 end
248 248
  249 + should 'not show product_category field on edit consumption form' do
  250 + product_category = ProductCategory.create!(:name => 'Food', :environment => Environment.default)
  251 + product = @enterprise.consumptions.create!(:product_category_id => product_category.id, :aditional_specifications => 'extra info')
  252 + get :edit_consumption, :profile => @enterprise.identifier, :id => product
  253 + assert_no_tag :tag => 'select', :attributes => { :name => 'consumption[product_category_id]' }
  254 + end
  255 +
249 end 256 end