Download as
Browse Code »

Commit 137c150428b872792ced3d52b9a123f26bb2e3c9

Authored by Rodrigo Souto
1 parent 0b0c001c
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Little fixes

Showing 3 changed files with 3 additions and 4 deletions   Show diff stats
plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb
  Diff comments   View file @137c150
@@ -98,10 +98,9 @@ class ShoppingCartPluginProfileController < ProfileController @@ -98,10 +98,9 @@ class ShoppingCartPluginProfileController < ProfileController
98 rescue Exception => exception 98 rescue Exception => exception
99 render :text => { 99 render :text => {
100 :ok => false, 100 :ok => false,
101 - :message => _('Your request failed.'),  
102 :error => { 101 :error => {
103 :code => 6, 102 :code => 6,
104 - :message => exception 103 + :message => exception.message
105 } 104 }
106 }.to_json 105 }.to_json
107 end 106 end
plugins/shopping_cart/lib/shopping_cart_plugin.rb
  Diff comments   View file @137c150
@@ -23,7 +23,7 @@ class ShoppingCartPlugin < Noosfero::Plugin @@ -23,7 +23,7 @@ class ShoppingCartPlugin < Noosfero::Plugin
23 alias :catalog_item_extras :add_to_cart_button 23 alias :catalog_item_extras :add_to_cart_button
24 alias :asset_product_extras :add_to_cart_button 24 alias :asset_product_extras :add_to_cart_button
25 25
26 - def stylesheets? 26 + def stylesheet?
27 true 27 true
28 end 28 end
29 29
plugins/shopping_cart/public/cart.js
  Diff comments   View file @137c150
@@ -264,7 +264,7 @@ function Cart(config) { @@ -264,7 +264,7 @@ function Cart(config) {
264 }, 264 },
265 cache: false, 265 cache: false,
266 error: function(ajax, status, errorThrown) { 266 error: function(ajax, status, errorThrown) {
267 - alert('Remove item - HTTP '+status+': '+errorThrown); 267 + alert('Send request - HTTP '+status+': '+errorThrown);
268 }, 268 },
269 complete: function() { 269 complete: function() {
270 $.colorbox.close(); 270 $.colorbox.close();