From d5af81aa0c8398d2959837f1f7570dcb3f0003ce Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 23 Apr 2012 11:02:32 +0200 Subject: [PATCH 01/12] [FIX] dataset internal context, domain state on search event, broken by model-based datasets bzr revid: xmo@openerp.com-20120423090232-fm3f8q6vm37emz4d --- addons/web/static/src/js/views.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 9625e074e83..7579de3dc36 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -391,8 +391,8 @@ instance.web.ViewManager = instance.web.Widget.extend({ contexts: [action_context].concat(contexts || []), group_by_seq: groupbys || [] }, function (results) { - self.dataset.context = results.context; - self.dataset.domain = results.domain; + self.dataset._model = new instance.web.Model( + self.dataset.model, results.context, results.domain); var groupby = results.group_by.length ? results.group_by : action_context.group_by; From 947aba0b6e1b6c7e847c1f25b3ca64334a09c9ae Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 23 Apr 2012 13:09:07 +0200 Subject: [PATCH 02/12] [FIX] Fixed form tooltips bzr revid: fme@openerp.com-20120423110907-6ge2jkd33kic5b0h --- addons/web/static/src/js/view_form.js | 4 ++-- addons/web/static/src/xml/base.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index fbbd5149470..c8c7eab5e44 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -1416,7 +1416,7 @@ instance.web.form.Widget = instance.web.Widget.extend(_.extend({}, instance.web. opacity: 0.85, trigger: 'hover' }, options || {}); - trigger.tipsy(options); + $(trigger).tipsy(options); }, _build_view_fields_values: function(blacklist) { var a_dataset = this.view.dataset; @@ -1704,7 +1704,7 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins }, this)); } if (instance.connection.debug) { - this.do_attach_tooltip(this, this.$element); + this.do_attach_tooltip(this, this.view.$element.find('label[for=' + this.id_for_label + ']')[0] || this.$element); } if (!this.disable_utility_classes) { var set_required = function() { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 57970c1486e..a3744842bb0 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -847,7 +847,7 @@
(nolabel)
-

+