Download as
Browse Code »

Commit c553ad104fd36571b3725ba6206bccfd653833a3

Authored by Antonio Terceiro
1 parent 72d8ae0c
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

Remove catch-all rescue clause 

It was masking a programming error, which is now fixed.
Showing 5 changed files with 9 additions and 5 deletions   Show diff stats
plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
  Diff comments   View file @c553ad1
@@ -114,7 +114,7 @@ class ShoppingCartPluginController < PublicController @@ -114,7 +114,7 @@ class ShoppingCartPluginController < PublicController
114 :message => _('Request sent successfully. Check your email.'), 114 :message => _('Request sent successfully. Check your email.'),
115 :error => {:code => 0} 115 :error => {:code => 0}
116 }.to_json 116 }.to_json
117 - rescue Exception => exception 117 + rescue ActiveRecord::ActiveRecordError
118 render :text => { 118 render :text => {
119 :ok => false, 119 :ok => false,
120 :error => { 120 :error => {
plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb
  Diff comments   View file @c553ad1
1 module ShoppingCartPlugin::CartHelper 1 module ShoppingCartPlugin::CartHelper
2 2
3 include ActionView::Helpers::NumberHelper 3 include ActionView::Helpers::NumberHelper
  4 + include ActionView::Helpers::TagHelper
4 5
5 def sell_price(product) 6 def sell_price(product)
6 return 0 if product.price.nil? 7 return 0 if product.price.nil?
plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb
  Diff comments   View file @c553ad1
@@ -12,7 +12,8 @@ class ShoppingCartPlugin::Mailer < Noosfero::Plugin::MailerBase @@ -12,7 +12,8 @@ class ShoppingCartPlugin::Mailer < Noosfero::Plugin::MailerBase
12 body :customer => customer, 12 body :customer => customer,
13 :supplier => supplier, 13 :supplier => supplier,
14 :items => items, 14 :items => items,
15 - :environment => supplier.environment 15 + :environment => supplier.environment,
  16 + :helper => self
16 end 17 end
17 18
18 def supplier_notification(customer, supplier, items) 19 def supplier_notification(customer, supplier, items)
@@ -25,6 +26,8 @@ class ShoppingCartPlugin::Mailer < Noosfero::Plugin::MailerBase @@ -25,6 +26,8 @@ class ShoppingCartPlugin::Mailer < Noosfero::Plugin::MailerBase
25 body :customer => customer, 26 body :customer => customer,
26 :supplier => supplier, 27 :supplier => supplier,
27 :items => items, 28 :items => items,
28 - :environment => supplier.environment 29 + :environment => supplier.environment,
  30 + :helper => self
  31 +
29 end 32 end
30 end 33 end
plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb
  Diff comments   View file @c553ad1
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 </ul> 35 </ul>
36 36
37 <p><%=_('Here are the products you bought:')%></p> 37 <p><%=_('Here are the products you bought:')%></p>
38 - <%= items_table(@items, @supplier, true) %> 38 + <%= @helper.items_table(@items, @supplier, true) %>
39 39
40 <p> 40 <p>
41 --<br/> 41 --<br/>
plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb
  Diff comments   View file @c553ad1
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 </ul> 33 </ul>
34 34
35 <p><%=_('And here are the items bought by this customer:')%></p> 35 <p><%=_('And here are the items bought by this customer:')%></p>
36 - <%= items_table(@items, @supplier, true) %> 36 + <%= @helper.items_table(@items, @supplier, true) %>
37 37
38 <p> 38 <p>
39 --<br/> 39 --<br/>