summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Kersten <jke@odoo.com>2018-04-24 21:55:46 +0200
committerJeremy Kersten <jke@odoo.com>2018-05-07 09:09:38 +0200
commit6a0274b300a25859d8c4d924dd9f032d5a0a39c9 (patch)
treed6bbd37155e3e18f0269675e3cffac13d19f3072
parent98a74c613bc8f82db9a7aa7c13e1142b129c894d (diff)
[FIX] website_sale_[wishlist|comparison]: don't try to add 'undefined' product
In case of a combinaison is not possible, the add to should not be shown. This commit is related to #23397
-rw-r--r--addons/website_sale_comparison/static/src/js/website_sale_comparison.js3
-rw-r--r--addons/website_sale_comparison/static/src/less/website_sale_comparison.less4
-rw-r--r--addons/website_sale_wishlist/static/src/js/website_sale_wishlist.js2
-rw-r--r--addons/website_sale_wishlist/static/src/less/website_sale_wishlist.less4
4 files changed, 12 insertions, 1 deletions
diff --git a/addons/website_sale_comparison/static/src/js/website_sale_comparison.js b/addons/website_sale_comparison/static/src/js/website_sale_comparison.js
index c5a9f593b6e..9d27a98d558 100644
--- a/addons/website_sale_comparison/static/src/js/website_sale_comparison.js
+++ b/addons/website_sale_comparison/static/src/js/website_sale_comparison.js
@@ -61,6 +61,9 @@ var ProductComparison = Widget.extend({
}
prod = parseInt(prod, 10);
}
+ if (!prod) {
+ return;
+ }
self.add_new_products(prod);
website_sale_utils.animate_clone($('#comparelist .o_product_panel_header'), $(this).closest('form'), -50, 10);
} else {
diff --git a/addons/website_sale_comparison/static/src/less/website_sale_comparison.less b/addons/website_sale_comparison/static/src/less/website_sale_comparison.less
index ff167568e8b..29ef1a1a5d5 100644
--- a/addons/website_sale_comparison/static/src/less/website_sale_comparison.less
+++ b/addons/website_sale_comparison/static/src/less/website_sale_comparison.less
@@ -50,5 +50,9 @@
margin-right: 8px;
}
}
+
+ div.css_not_available .o_add_compare_dyn {
+ display: none;
+ }
}
diff --git a/addons/website_sale_wishlist/static/src/js/website_sale_wishlist.js b/addons/website_sale_wishlist/static/src/js/website_sale_wishlist.js
index 3eb511140a3..3be63b14ad2 100644
--- a/addons/website_sale_wishlist/static/src/js/website_sale_wishlist.js
+++ b/addons/website_sale_wishlist/static/src/js/website_sale_wishlist.js
@@ -75,7 +75,7 @@ var ProductWishlist = Widget.extend({
if (!product_id && e.currentTarget.classList.contains('o_add_wishlist_dyn')) {
product_id = parseInt($el.parent().find('.product_id').val());
}
- if (!_.contains(self.wishlist_product_ids, product_id)) {
+ if (product_id && !_.contains(self.wishlist_product_ids, product_id)) {
return ajax.jsonRpc('/shop/wishlist/add', 'call', {
'product_id': product_id
}).then(function () {
diff --git a/addons/website_sale_wishlist/static/src/less/website_sale_wishlist.less b/addons/website_sale_wishlist/static/src/less/website_sale_wishlist.less
index 2bac6365fa7..7804a44f1b1 100644
--- a/addons/website_sale_wishlist/static/src/less/website_sale_wishlist.less
+++ b/addons/website_sale_wishlist/static/src/less/website_sale_wishlist.less
@@ -2,6 +2,10 @@
.td-wish-btn {
width: 140px;
}
+
+ div.css_not_available .o_add_wishlist_dyn {
+ display: none;
+ }
}
// XS size