From bc5772ab7e1ac2c49b1ffaa5ca67bbe7326da009 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 6 Nov 2013 17:39:27 +0100 Subject: [PATCH 01/21] [FIX] website snippet: editor overlay (bounce, display after click on insert block) bzr revid: chm@openerp.com-20131106163927-vdqxfamnkspnb193 --- addons/website/static/src/js/website.snippets.js | 6 +++--- addons/website/static/src/xml/website.snippets.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/website/static/src/js/website.snippets.js b/addons/website/static/src/js/website.snippets.js index 1933668314a..16dab3af262 100644 --- a/addons/website/static/src/js/website.snippets.js +++ b/addons/website/static/src/js/website.snippets.js @@ -237,6 +237,7 @@ } if (this.$active_snipped_id) { this.snippet_blur(this.$active_snipped_id); + this.$active_snipped_id = false; } if ($snipped_id) { if(_.indexOf(this.snippets, $snipped_id.get(0)) === -1) { @@ -245,8 +246,6 @@ this.$active_snipped_id = $snipped_id; this.create_overlay(this.$active_snipped_id); this.snippet_focus($snipped_id); - } else { - self.$active_snipped_id = false; } }, create_overlay: function ($snipped_id) { @@ -750,6 +749,7 @@ var index = _.indexOf(self.parent.snippets, self.$target.get(0)); delete self.parent.snippets[index]; self.$target.remove(); + self.$overlay.remove(); return false; }); this._drag_and_drop(); @@ -768,7 +768,7 @@ * This method is called when the user click inside the snippet in the dom */ onFocus : function () { - this.$overlay.addClass('oe_active'); + this.$overlay.addClass('oe_active').effect('bounce', {distance: 18, times: 5}, 250); }, /* onFocus diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml index dbcc077e1e7..103392a23b7 100644 --- a/addons/website/static/src/xml/website.snippets.xml +++ b/addons/website/static/src/xml/website.snippets.xml @@ -63,7 +63,7 @@
    From 418ea510f40b9d72a403028aa2d5d030d17fb587 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 6 Nov 2013 18:22:51 +0100 Subject: [PATCH 02/21] [FIX] website_crm_partner_assign: Selecting 'All Grades' => exception bzr revid: chm@openerp.com-20131106172251-aejb1b9lcwwv9o3h --- addons/website_crm_partner_assign/controllers/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py index 13facb2408f..62f64f99187 100644 --- a/addons/website_crm_partner_assign/controllers/main.py +++ b/addons/website_crm_partner_assign/controllers/main.py @@ -28,7 +28,7 @@ class WebsiteCrmPartnerAssign(http.Controller): if request.context['is_public_user']: base_partner_domain += [('website_published', '=', True)] partner_domain = list(base_partner_domain) - if grade_id: + if grade_id and grade_id != "all": partner_domain += [('grade_id', '=', int(grade_id))] # try/catch int if country_id: country = country_obj.browse(request.cr, request.uid, country_id, request.context) From d98f7b0918917146f52e532ccf4dcaff51156eb6 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 6 Nov 2013 18:34:04 +0100 Subject: [PATCH 03/21] [FIX] website snippet: cta dark background bzr revid: chm@openerp.com-20131106173404-ma3sqc3tw9pmwbw6 --- addons/website/views/snippets.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml index 39afaefe13a..d10eee50f1d 100644 --- a/addons/website/views/snippets.xml +++ b/addons/website/views/snippets.xml @@ -555,7 +555,7 @@ Button
-
+
From b7a4c6d3f0c22e7aaed5d1e58cc6bca232f4f756 Mon Sep 17 00:00:00 2001 From: ddm Date: Wed, 6 Nov 2013 18:57:43 +0100 Subject: [PATCH 04/21] [FIX] eCommerve search + categories & filters Hopefully this completely solves it. More testing required... bzr revid: ddm@openerp.com-20131106175743-xxxswsc0vs5fh3x5 --- addons/website_sale/controllers/main.py | 14 ++++++++--- addons/website_sale/views/website_sale.xml | 27 +++++++++++----------- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py index c25a64e7b22..e6326832c55 100644 --- a/addons/website_sale/controllers/main.py +++ b/addons/website_sale/controllers/main.py @@ -264,7 +264,7 @@ class Ecommerce(http.Controller): post.pop(key) return request.redirect("/shop/?filter=%s%s%s%s" % ( - simplejson.dumps(filter).replace(" ", ""), + simplejson.dumps(filter), add_filter and "&add_filter=%s" % add_filter or "", post.get("search") and "&search=%s" % post.get("search") or "", post.get("category") and "&category=%s" % post.get("category") or "" @@ -331,7 +331,11 @@ class Ecommerce(http.Controller): 'Ecommerce': self, 'product_ids': product_ids, 'product_ids_for_holes': fill_hole, - 'search': post or dict(), + 'search': { + 'search': post.get('search') or '', + 'category': category, + 'filter': filter or '', + }, 'pager': pager, 'styles': styles, 'style_in_product': lambda style, product: style.id in [s.id for s in product.website_style_ids], @@ -364,7 +368,11 @@ class Ecommerce(http.Controller): 'category_list': category_list, 'main_object': product, 'product': product, - 'search': post or dict(), + 'search': { + 'search': post.get('search') or '', + 'category': post.get('category') or '', + 'filter': post.get('filter') or '', + } } return request.website.render("website_sale.product", values) diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml index 2c3154ac3d5..37ebe3cda41 100644 --- a/addons/website_sale/views/website_sale.xml +++ b/addons/website_sale/views/website_sale.xml @@ -33,6 +33,13 @@ + +