From c553ad104fd36571b3725ba6206bccfd653833a3 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Fri, 28 Dec 2012 21:23:08 -0300 Subject: [PATCH] Remove catch-all rescue clause --- plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb | 2 +- plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb | 1 + plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb | 7 +++++-- plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb | 2 +- plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb b/plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb index a77b652..ff5b6af 100644 --- a/plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb +++ b/plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb @@ -114,7 +114,7 @@ class ShoppingCartPluginController < PublicController :message => _('Request sent successfully. Check your email.'), :error => {:code => 0} }.to_json - rescue Exception => exception + rescue ActiveRecord::ActiveRecordError render :text => { :ok => false, :error => { diff --git a/plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb b/plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb index dfeb2b1..322e03f 100644 --- a/plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb +++ b/plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb @@ -1,6 +1,7 @@ module ShoppingCartPlugin::CartHelper include ActionView::Helpers::NumberHelper + include ActionView::Helpers::TagHelper def sell_price(product) return 0 if product.price.nil? diff --git a/plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb b/plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb index ad5fee0..606701d 100644 --- a/plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb +++ b/plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb @@ -12,7 +12,8 @@ class ShoppingCartPlugin::Mailer < Noosfero::Plugin::MailerBase body :customer => customer, :supplier => supplier, :items => items, - :environment => supplier.environment + :environment => supplier.environment, + :helper => self end def supplier_notification(customer, supplier, items) @@ -25,6 +26,8 @@ class ShoppingCartPlugin::Mailer < Noosfero::Plugin::MailerBase body :customer => customer, :supplier => supplier, :items => items, - :environment => supplier.environment + :environment => supplier.environment, + :helper => self + end end diff --git a/plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb b/plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb index 6afb388..5f8dbcd 100644 --- a/plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb +++ b/plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb @@ -35,7 +35,7 @@

<%=_('Here are the products you bought:')%>

- <%= items_table(@items, @supplier, true) %> + <%= @helper.items_table(@items, @supplier, true) %>

--
diff --git a/plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb b/plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb index 7f791ae..353287f 100644 --- a/plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb +++ b/plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb @@ -33,7 +33,7 @@

<%=_('And here are the items bought by this customer:')%>

- <%= items_table(@items, @supplier, true) %> + <%= @helper.items_table(@items, @supplier, true) %>

--
-- libgit2 0.21.2