From 78c82fc0c656ab579593a600b52c3362b0dded7d Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 29 Aug 2013 14:44:48 +0200
Subject: [FIX] tree views: rename variable parent-id to avoid conflicts with
 record fields name (eg: account.account)

bzr revid: mat@openerp.com-20130829124448-xr89v0gsuoukqhao
---
 addons/web/static/src/js/view_tree.js | 11 +++++------
 addons/web/static/src/xml/base.xml    |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/view_tree.js b/addons/web/static/src/js/view_tree.js
index a9ec2bb6001..70873f48d6f 100644
--- a/addons/web/static/src/js/view_tree.js
+++ b/addons/web/static/src/js/view_tree.js
@@ -163,13 +163,13 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie
             var is_loaded = 0,
                 $this = $(this),
                 record_id = $this.data('id'),
-                parent_id = $this.data('parent-id'),
+                row_parent_id = $this.data('row-parent-id'),
                 record = self.records[record_id],
                 children_ids = record[self.children_field];
 
             _(children_ids).each(function(childid) {
-                if (self.$el.find('[id=treerow_' + childid + '][data-parent-id='+ record_id +']').length ) {
-                    if (self.$el.find('[id=treerow_' + childid + '][data-parent-id='+ record_id +']').is(':hidden')) {
+                if (self.$el.find('[id=treerow_' + childid + '][data-row-parent-id='+ record_id +']').length ) {
+                    if (self.$el.find('[id=treerow_' + childid + '][data-row-parent-id='+ record_id +']').is(':hidden')) {
                         is_loaded = -1;
                     } else {
                         is_loaded++;
@@ -193,7 +193,6 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie
             _(records).each(function (record) {
                 self.records[record.id] = record;
             });
-
             var $curr_node = self.$el.find('#treerow_' + id);
             var children_rows = QWeb.render('TreeView.rows', {
                 'records': records,
@@ -203,7 +202,7 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie
                 'level': $curr_node.data('level') || 0,
                 'render': instance.web.format_value,
                 'color_for': self.color_for,
-                'parent_id': id
+                'row_parent_id': id
             });
             if ($curr_node.length) {
                 $curr_node.addClass('oe_open');
@@ -247,7 +246,7 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie
     showcontent: function (curnode,record_id, show) {
         curnode.parent('tr').toggleClass('oe_open', show);
         _(this.records[record_id][this.children_field]).each(function (child_id) {
-            var $child_row = this.$el.find('[id=treerow_' + child_id + '][data-parent-id='+ curnode.data('id') +']');
+            var $child_row = this.$el.find('[id=treerow_' + child_id + '][data-row-parent-id='+ curnode.data('id') +']');
             if ($child_row.hasClass('oe_open')) {
                 $child_row.toggleClass('oe_open',show);
                 this.showcontent($child_row, child_id, false);
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 470c6e83d07..c5bc624c2b1 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -685,7 +685,7 @@
         t-foreach="records" t-as="record"
         t-att-id="'treerow_' + record.id"
         t-att-data-id="record.id" t-att-data-level="level + 1"
-        t-att-data-parent-id="parent_id">
+        t-att-data-row-parent-id="row_parent_id">
     <t t-set="children" t-value="record[children_field]"/>
     <t t-set="class" t-value="children and children.length ? 'treeview-tr' : 'treeview-td'"/>
     <t t-set="rank" t-value="'oe-treeview-first'"/>
-- 
cgit v1.2.3


From 1bd6608df9bc2f400d219d232ae715e8c114379d Mon Sep 17 00:00:00 2001
From: Anael Closson <acl@openerp.com>
Date: Thu, 5 Sep 2013 11:21:22 +0200
Subject: [FIX] OWP 593963 : limit results when opening "search more" as it's
 really slow when lot of records in database

bzr revid: acl@openerp.com-20130905092122-47ynnssvvvo4aef2
---
 addons/web/static/src/js/view_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index b9f1d91b700..c7314888703 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2934,7 +2934,7 @@ instance.web.form.CompletionFieldMixin = {
                 values.push({
                     label: _t("Search More..."),
                     action: function() {
-                        dataset.name_search(search_val, self.build_domain(), 'ilike', false).done(function(data) {
+                        dataset.name_search(search_val, self.build_domain(), 'ilike', 160).done(function(data) {
                             self._search_create_popup("search", data);
                         });
                     },
-- 
cgit v1.2.3


From dbedded58e3db57e3532dbc7cc0881e3c9fd0fa0 Mon Sep 17 00:00:00 2001
From: Anael Closson <acl@openerp.com>
Date: Thu, 5 Sep 2013 17:58:17 +0200
Subject: [FIX] OPW 597162 : context not properly retreived and therefore not
 sent when retreiving o2m and m2m lines

lp bug: https://launchpad.net/bugs/1217374 fixed

bzr revid: acl@openerp.com-20130905155817-llmjnsmd252q3286
---
 addons/web/static/src/js/data.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 679afe77bcd..e535be294aa 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -432,7 +432,7 @@ instance.web.DataSet =  instance.web.Class.extend(instance.web.PropertiesMixin,
         // TODO: reorder results to match ids list
         return this._model.call('read',
             [ids, fields || false],
-            {context: this._model.context(options.context)});
+            {context: this.get_context(options.context)});
     },
     /**
      * Read a slice of the records represented by this DataSet, based on its
-- 
cgit v1.2.3


From 56382a450a4c5572a17dca3054bf23654013910a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 13 Sep 2013 12:40:26 +0200
Subject: [FIX] problem with page reload after installing a module

lp bug: https://launchpad.net/bugs/1214814 fixed

bzr revid: nicolas.vanhoren@openerp.com-20130913104026-rxtl7h1u7vuixyvm
---
 addons/web/static/src/js/chrome.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 55ab5ec073d..793dbd43d76 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -808,7 +808,7 @@ instance.web.redirect = function(url, wait) {
         if (old === url) {
             window.location.reload();
         } else {
-            window.location = url;
+            window.location.href = url;
         }
     };
 
-- 
cgit v1.2.3


From 6d411f706509316795ecb3eb362f0b42b2740ae6 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 13 Sep 2013 14:40:26 +0200
Subject: [FIX] really solve reload problem

lp bug: https://launchpad.net/bugs/1214814 fixed

bzr revid: nicolas.vanhoren@openerp.com-20130913124026-yhchgik5yznkme19
---
 addons/web/static/src/js/chrome.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 793dbd43d76..11a2e58ae5b 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -805,10 +805,11 @@ instance.web.redirect = function(url, wait) {
 
     var load = function() {
         var old = "" + window.location;
-        if (old === url) {
-            window.location.reload();
-        } else {
-            window.location.href = url;
+        var old_no_hash = old.split("#")[0];
+        var url_no_hash = url.split("#")[0];
+        location.assign(url);
+        if (old_no_hash === url_no_hash) {
+            location.reload(true);
         }
     };
 
-- 
cgit v1.2.3


From 14a8b64f02d67d7b40e19c5291827892f4ca22dd Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 19 Sep 2013 15:55:17 +0200
Subject: [FIX]web base: when kanban view was setted after the tree view in the
 views sequence, the form view was located in the footer of the web page.

bzr revid: dle@openerp.com-20130919135517-5e3pvtbyvz13vn31
---
 addons/web/static/src/css/base.css  | 2 +-
 addons/web/static/src/css/base.sass | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 977f72fc1e0..9e77fc316b5 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1432,7 +1432,7 @@
   display: table-row;
   height: inherit;
 }
-.openerp .oe_view_manager .oe_view_manager_view_kanban {
+.openerp .oe_view_manager .oe_view_manager_view_kanban:not(:empty) {
   height: inherit;
 }
 .openerp .oe_view_manager table.oe_view_manager_header {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 75b81487743..b2cca813331 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1150,7 +1150,7 @@ $sheet-padding: 16px
         .oe_view_manager_body
             display: table-row
             height: inherit
-        .oe_view_manager_view_kanban
+        .oe_view_manager_view_kanban:not(:empty)
             height: inherit
 
         table.oe_view_manager_header
-- 
cgit v1.2.3


From 38e3daed00b9bfc7386a0c08debe7bc2f164f165 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 25 Sep 2013 16:45:56 +0200
Subject: wip

bzr revid: nicolas.vanhoren@openerp.com-20130925144556-97abdprnibq631sc
---
 addons/web/static/src/js/view_form.js | 71 +++++++++++++++++++++++++++++++++++
 addons/web/static/src/xml/base.xml    | 13 +++++++
 2 files changed, 84 insertions(+)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 324896112cc..679eee0d361 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -5629,6 +5629,76 @@ instance.web.form.FieldMonetary = instance.web.form.FieldFloat.extend({
     },
 });
 
+/*
+
+*/
+instance.web.form.FieldMany2ManyCheckBoxes = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, {
+    className: "oe_form_many2many_checkboxes",
+    init: function() {
+        this._super.apply(this, arguments);
+        this.set("value", {});
+        this.set("records", []);
+        this.field_manager.on("view_content_has_changed", this, function() {
+            var domain = new openerp.web.CompoundDomain(this.build_domain()).eval();
+            if (! _.isEqual(domain, this.get("domain"))) {
+                this.set("domain", domain);
+            }
+        });
+        this.records_orderer = new instance.web.DropMisordered();
+    },
+    initialize_field: function() {
+        instance.web.form.ReinitializeFieldMixin.initialize_field.call(this)
+        this.on("change:domain", this, this.query_records);
+        this.set("domain", new openerp.web.CompoundDomain(this.build_domain()).eval());
+        this.on("change:records", this, this.render_value);
+    },
+    query_records: function() {
+        var self = this;
+        var model = new openerp.Model(openerp.session, this.field.relation);
+        this.records_orderer.add(model.call("search", [this.get("domain")], {"context": this.build_context()}).then(function(record_ids) {
+            return model.call("name_get", [record_ids] , {"context": self.build_context()});
+        })).then(function(res) {
+            self.set("records", res);
+        });
+    },
+    render_value: function() {
+        this.$().html(QWeb.render("FieldMany2ManyCheckBoxes", {widget: this, selected: this.get("value")}));
+        var inputs = this.$("input");
+        inputs.change(_.bind(this.from_dom, this));
+        if (this.get("effective_readonly"))
+            inputs.attr("disabled", "true");
+    },
+    from_dom: function() {
+        var new_value = {};
+        this.$("input").each(function() {
+            var elem = $(this);
+            new_value[elem.data("record-id")] = elem.attr("checked") ? true : undefined;
+        });
+        if (! _.isEqual(new_value, this.get("value")))
+            this.internal_set_value(new_value);
+    },
+    set_value: function(value) {
+        value = value || [];
+        if (value.length >= 1 && value[0] instanceof Array) {
+            value = value[0][2];
+        }
+        var formatted = {};
+        _.each(value, function(el) {
+            formatted[JSON.stringify(el)] = true;
+        });
+        this._super(formatted);
+    },
+    get_value: function() {
+        var value = _.filter(_.keys(this.get("value")), function(el) {
+            return this.get("value")[el];
+        }, this);
+        value = _.map(value, function(el) {
+            return JSON.parse(el);
+        });
+        return [commands.replace_with(value)];
+    },
+});
+
 /**
  * Registry of form fields, called by :js:`instance.web.FormView`.
  *
@@ -5664,6 +5734,7 @@ instance.web.form.widgets = new instance.web.Registry({
     'many2many_binary': 'instance.web.form.FieldMany2ManyBinaryMultiFiles',
     'statusbar': 'instance.web.form.FieldStatus',
     'monetary': 'instance.web.form.FieldMonetary',
+    'many2many_checkboxes': 'instance.web.form.FieldMany2ManyCheckBoxes',
 });
 
 /**
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index ee87237d045..48c51c4837c 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1934,4 +1934,17 @@
         </t>
     </t>
 </t>
+<t t-name="FieldMany2ManyCheckBoxes">
+    <t t-foreach="widget.get('records')" t-as="record">
+        <div>
+            <t t-if="selected[record[0]]">
+                <input type="checkbox" t-att-data-record-id="JSON.stringify(record[0])" checked="true"/>
+            </t>
+            <t t-if="! selected[record[0]]">
+                <input type="checkbox" t-att-data-record-id="JSON.stringify(record[0])"/>
+            </t>
+            <t t-esc="record[1]"/>
+        </div>
+    </t>
+</t>
 </templates>
-- 
cgit v1.2.3


From 4aad26f5c27391afe235218b868652755c399f73 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 26 Sep 2013 18:49:02 +0200
Subject: [ADD] es5-shim

bzr revid: fme@openerp.com-20130926164902-5ioas0np4tb9qnge
---
 addons/web/static/src/js/core.js | 25 -------------------------
 1 file changed, 25 deletions(-)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 8c69f86c47e..37a217a8664 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -11,31 +11,6 @@ if (typeof(console) === "undefined") {
     });
 }
 
-// shim provided by mozilla for function.bind
-if (!Function.prototype.bind) {
-  Function.prototype.bind = function (oThis) {
-    if (typeof this !== "function") {
-      // closest thing possible to the ECMAScript 5 internal IsCallable function
-      throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");
-    }
-
-    var aArgs = Array.prototype.slice.call(arguments, 1), 
-        fToBind = this, 
-        fNOP = function () {},
-        fBound = function () {
-          return fToBind.apply(this instanceof fNOP && oThis
-                                 ? this
-                                 : oThis,
-                               aArgs.concat(Array.prototype.slice.call(arguments)));
-        };
-
-    fNOP.prototype = this.prototype;
-    fBound.prototype = new fNOP();
-
-    return fBound;
-  };
-}
-
 var instance = openerp;
 openerp.web.core = {};
 
-- 
cgit v1.2.3


From fb17860c4110baa50d7d9bbde1afe176c5f7085e Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 1 Oct 2013 18:07:54 +0200
Subject: [IMP] doc

bzr revid: nicolas.vanhoren@openerp.com-20131001160754-w47z24xf3wtkqioh
---
 addons/web/static/src/js/view_form.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 679eee0d361..a00b66cbeda 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -5630,7 +5630,9 @@ instance.web.form.FieldMonetary = instance.web.form.FieldFloat.extend({
 });
 
 /*
-
+    This type of field display a list of checkboxes. It works only with m2ms. This field will display one checkbox for each
+    record existing in the model targeted by the relation, according to the given domain if one is specified. Checked records
+    will be added to the relation.
 */
 instance.web.form.FieldMany2ManyCheckBoxes = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, {
     className: "oe_form_many2many_checkboxes",
-- 
cgit v1.2.3


From 58281701e99a03b671f60f614a6f1ce0a8f5def7 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 2 Oct 2013 11:46:34 +0200
Subject: [FIX] web: remove firefox css fix for view switch icons

bzr revid: chs@openerp.com-20131002094634-9g7b20vs7n5yw4kh
---
 addons/web/static/src/css/base.css  | 3 ---
 addons/web/static/src/css/base.sass | 2 --
 2 files changed, 5 deletions(-)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 97bbb2b207c..fe14cc28a62 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -3211,9 +3211,6 @@
 }
 
 @-moz-document url-prefix() {
-  .openerp .oe_view_manager .oe_view_manager_switch li {
-    line-height: 21px;
-  }
   .openerp .oe_searchview .oe_searchview_search {
     top: -1px;
   }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index e41a182407d..5571b5696fc 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2532,8 +2532,6 @@ $sheet-padding: 16px
     // }}}
 @-moz-document url-prefix()
     .openerp
-        .oe_view_manager .oe_view_manager_switch li
-            line-height: 21px
         .oe_searchview .oe_searchview_search
             top: -1px
         .oe_form_field_many2one .oe_m2o_cm_button
-- 
cgit v1.2.3


From 5a70bc038a2fa5aeb14ac3b3d95c4e619fa4e058 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 2 Oct 2013 16:37:40 +0200
Subject: Changed base url

bzr revid: nicolas.vanhoren@openerp.com-20131002143740-jr8xz6j4qgs97ztp
---
 addons/web/static/src/js/chrome.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 11a2e58ae5b..09694bb0c38 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -534,7 +534,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
                     'login': 'admin',
                     'password': form_obj['create_admin_pwd'],
                     'login_successful': function() {
-                        var url = '/?db=' + form_obj['db_name'];
+                        var url = '/web?db=' + form_obj['db_name'];
                         if (self.session.debug) {
                             url += '&debug';
                         }
-- 
cgit v1.2.3


From 6e6977e0f24fdf273f43b5d8a5a9a6aa4a22c007 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 3 Oct 2013 11:00:49 +0200
Subject: [FIX] web: form_view: FieldStatus widget: fixed hidden states/stages
 not appearing because behind displayed sheet.

bzr revid: tde@openerp.com-20131003090049-88q0o69970eahb2h
---
 addons/web/static/src/css/base.css  | 1 +
 addons/web/static/src/css/base.sass | 1 +
 2 files changed, 2 insertions(+)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index fe14cc28a62..51c3fd30f3c 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2741,6 +2741,7 @@
 }
 .openerp ul.oe_form_status .oe_folded ul, .openerp ul.oe_form_status_clickable .oe_folded ul {
   position: absolute;
+  z-index: 1000;
   border-top: 1px solid #cacaca;
   float: none;
   top: 30px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 5571b5696fc..a0231387e7f 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2179,6 +2179,7 @@ $sheet-padding: 16px
                 padding-bottom: 8px
             ul
                 position: absolute
+                z-index: 1000
                 border-top: 1px solid #cacaca
                 float: none
                 top: 30px
-- 
cgit v1.2.3


From 63c0220d3152332e54f118c6affc9fffcacde3dd Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 4 Oct 2013 17:37:34 +0200
Subject: still some problems

bzr revid: nicolas.vanhoren@openerp.com-20131004153734-rxdt32qvu3gcxip2
---
 addons/web/static/src/js/view_form.js | 75 +++++++++++++++++++++++++++++++++++
 addons/web/static/src/xml/base.xml    |  3 ++
 2 files changed, 78 insertions(+)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index a00b66cbeda..2069a33ab2a 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -5701,6 +5701,80 @@ instance.web.form.FieldMany2ManyCheckBoxes = instance.web.form.AbstractField.ext
     },
 });
 
+instance.web.form.X2ManyCounter = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, {
+    className: "oe_form_x2many_counter",
+    init: function() {
+        this._super.apply(this, arguments);
+        this.set("value", []);
+        _.defaults(this.options, {
+            "views": [[false, "tree"], [false, "form"]],
+        });
+    },
+    render_value: function() {
+        var text = _.str.sprintf("%d %s", this.val().length, this.string);
+        this.$().html(QWeb.render("X2ManyCounter", {text: text}));
+        this.$("a").click(_.bind(this.go_to, this));
+    },
+    go_to: function() {
+        return this.view.recursive_save().then(_.bind(function() {
+            var val = this.val();
+            var context = {};
+
+/*
+Object {groups_id: Array[0], domain: false, help: "<p class='oe_view_nocontent_create'>Click here to …documents, etc.↵                </p>↵            ", res_model: "project.task", search_view_id: Array[2]…}
+auto_refresh: 0
+auto_search: true
+context: Class
+domain: false
+filter: false
+flags: Object
+groups_id: Array[0]
+help: "<p class='oe_view_nocontent_create'>Click here to add new tasks</p><p>↵                    OpenERP's project management allows you to manage the pipeline↵                    of tasks in order to get things done efficiently. You can↵                    track progress, discuss on tasks, attach documents, etc.↵                </p>↵            "
+id: 151
+limit: 80
+multi: false
+name: "Tasks"
+res_id: 0
+res_model: "project.task"
+search_view: "{'name': u'project.task.search.form', 'fields': {'categ_ids': {'domain': [], 'string': 'Tags', 'views': {}, 'm2m_join_columns': ['project_task_id', 'project_category_id'], 'm2m_join_table': 'project_category_project_task_rel', 'relation': 'project.category', 'context': {}, 'selectable': True, 'type': 'many2many'}, 'partner_id': {'domain': [], 'string': 'Customer', 'views': {}, 'relation': 'res.partner', 'context': {}, 'selectable': True, 'type': 'many2one'}, 'user_id': {'domain': [], 'string': 'Assigned to', 'views': {}, 'relation': 'res.users', 'context': {}, 'selectable': True, 'type': 'many2one'}, 'project_id': {'domain': [], 'string': 'Project', 'views': {}, 'relation': 'project.project', 'context': {}, 'selectable': True, 'type': 'many2one', 'select': '1'}, 'stage_id': {'domain': "[('project_ids', '=', project_id)]", 'string': 'Stage', 'views': {}, 'relation': 'project.task.type', 'context': {}, 'selectable': True, 'type': 'many2one'}, 'name': {'string': 'Task Summary', 'views': {}, 'required': True, 'selectable': True, 'type': 'char', 'select': True, 'size': 128}}, 'arch': '<search string="Tasks">\n                    <field name="name" string="Tasks" modifiers="{&quot;required&quot;: true}"/>\n                    <field name="categ_ids" modifiers="{}"/>\n                    <filter string="Unassigned" name="unassigned" domain="[(\'user_id\', \'=\', False)]"/>\n                    <filter string="New" name="draft" domain="[(\'stage_id.sequence\', \'=\', 1)]"/>\n                    <separator/>\n                    <filter string="My Tasks" domain="[(\'user_id\',\'=\',uid)]"/>\n                    <separator/>\n                    <filter string="Unread Messages" name="message_unread" domain="[(\'message_unread\',\'=\',True)]"/>\n                    <separator/>\n                    <filter string="Deadlines" context="{\'deadline_visible\': False}" domain="[(\'date_deadline\',\'&lt;&gt;\',False)]" help="Show only tasks having a deadline"/>\n                    <field name="partner_id" modifiers="{}"/>\n                    <field name="project_id" modifiers="{}"/>\n                    <field name="user_id" modifiers="{}"/>\n                    <field name="stage_id" domain="[]" modifiers="{}"/>\n                    <group expand="0" string="Group By...">\n                        <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]" context="{\'group_by\':\'user_id\'}"/>\n                        <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{\'group_by\':\'project_id\'}"/>\n                        <filter string="Stage" name="group_stage_id" icon="terp-stage" domain="[]" context="{\'group_by\':\'stage_id\'}"/>\n                        <filter string="Last Stage Update" icon="terp-go-month" domain="[]" context="{\'group_by\':\'date_last_stage_update\'}"/>\n                        <filter string="Deadline" icon="terp-gnome-cpu-frequency-applet+" domain="[]" context="{\'group_by\':\'date_deadline\'}"/>\n                        <filter string="Start Month" icon="terp-go-month" domain="[]" context="{\'group_by\':\'date_start\'}"/>\n                        <filter string="End Month" icon="terp-go-month" domain="[]" context="{\'group_by\':\'date_end\'}" invisible="1" modifiers="{&quot;invisible&quot;: true}"/>\n                    </group>\n                </search>', 'model': 'project.task', 'type': u'search', 'view_id': 288, 'field_parent': False}"
+search_view_id: Array[2]
+src_model: false
+target: "current"
+type: "ir.actions.act_window"
+usage: false
+view_id: false
+view_ids: Array[0]
+view_mode: "kanban,list,form,calendar,gantt,graph"
+views: Array[6]
+__proto__: Object
+*/
+
+            if (this.field.type === "one2many") {
+                context["default_" + this.field.relation_field] = this.view.datarecord.id;
+            }
+            context["search_default_"+ this.field.relation_field] = [this.view.datarecord.id];
+            return this.do_action({
+                type: 'ir.actions.act_window',
+                auto_search: true,
+                name: this.string,
+                res_model: this.field.relation,
+                res_id: val.length >= 1 ? val[0] : false,
+                res_ids: val,
+                views: this.options.views,
+                target: 'current',
+                context: {},
+            });
+        }, this));
+    },
+    val: function() {
+        var value = this.get("value") || [];
+        if (value.length >= 1 && value[0] instanceof Array) {
+            value = value[0][2];
+        }
+        return value;
+    }
+});
+
 /**
  * Registry of form fields, called by :js:`instance.web.FormView`.
  *
@@ -5737,6 +5811,7 @@ instance.web.form.widgets = new instance.web.Registry({
     'statusbar': 'instance.web.form.FieldStatus',
     'monetary': 'instance.web.form.FieldMonetary',
     'many2many_checkboxes': 'instance.web.form.FieldMany2ManyCheckBoxes',
+    'x2many_counter': 'instance.web.form.X2ManyCounter',
 });
 
 /**
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 48c51c4837c..20ee2545cf2 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1947,4 +1947,7 @@
         </div>
     </t>
 </t>
+<t t-name="X2ManyCounter">
+    <a href="javascript:void(0)"><t t-esc="text"/></a>
+</t>
 </templates>
-- 
cgit v1.2.3


From dc8f0ca96e5e58341f16c6713a08cbcaf210d9d7 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 4 Oct 2013 17:45:34 +0200
Subject: corrected problems

bzr revid: nicolas.vanhoren@openerp.com-20131004154534-b3x46pmbybtza1cs
---
 addons/web/static/src/js/view_form.js | 35 +++--------------------------------
 1 file changed, 3 insertions(+), 32 deletions(-)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 2069a33ab2a..859c78d7217 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -5719,50 +5719,21 @@ instance.web.form.X2ManyCounter = instance.web.form.AbstractField.extend(instanc
         return this.view.recursive_save().then(_.bind(function() {
             var val = this.val();
             var context = {};
-
-/*
-Object {groups_id: Array[0], domain: false, help: "<p class='oe_view_nocontent_create'>Click here to …documents, etc.↵                </p>↵            ", res_model: "project.task", search_view_id: Array[2]…}
-auto_refresh: 0
-auto_search: true
-context: Class
-domain: false
-filter: false
-flags: Object
-groups_id: Array[0]
-help: "<p class='oe_view_nocontent_create'>Click here to add new tasks</p><p>↵                    OpenERP's project management allows you to manage the pipeline↵                    of tasks in order to get things done efficiently. You can↵                    track progress, discuss on tasks, attach documents, etc.↵                </p>↵            "
-id: 151
-limit: 80
-multi: false
-name: "Tasks"
-res_id: 0
-res_model: "project.task"
-search_view: "{'name': u'project.task.search.form', 'fields': {'categ_ids': {'domain': [], 'string': 'Tags', 'views': {}, 'm2m_join_columns': ['project_task_id', 'project_category_id'], 'm2m_join_table': 'project_category_project_task_rel', 'relation': 'project.category', 'context': {}, 'selectable': True, 'type': 'many2many'}, 'partner_id': {'domain': [], 'string': 'Customer', 'views': {}, 'relation': 'res.partner', 'context': {}, 'selectable': True, 'type': 'many2one'}, 'user_id': {'domain': [], 'string': 'Assigned to', 'views': {}, 'relation': 'res.users', 'context': {}, 'selectable': True, 'type': 'many2one'}, 'project_id': {'domain': [], 'string': 'Project', 'views': {}, 'relation': 'project.project', 'context': {}, 'selectable': True, 'type': 'many2one', 'select': '1'}, 'stage_id': {'domain': "[('project_ids', '=', project_id)]", 'string': 'Stage', 'views': {}, 'relation': 'project.task.type', 'context': {}, 'selectable': True, 'type': 'many2one'}, 'name': {'string': 'Task Summary', 'views': {}, 'required': True, 'selectable': True, 'type': 'char', 'select': True, 'size': 128}}, 'arch': '<search string="Tasks">\n                    <field name="name" string="Tasks" modifiers="{&quot;required&quot;: true}"/>\n                    <field name="categ_ids" modifiers="{}"/>\n                    <filter string="Unassigned" name="unassigned" domain="[(\'user_id\', \'=\', False)]"/>\n                    <filter string="New" name="draft" domain="[(\'stage_id.sequence\', \'=\', 1)]"/>\n                    <separator/>\n                    <filter string="My Tasks" domain="[(\'user_id\',\'=\',uid)]"/>\n                    <separator/>\n                    <filter string="Unread Messages" name="message_unread" domain="[(\'message_unread\',\'=\',True)]"/>\n                    <separator/>\n                    <filter string="Deadlines" context="{\'deadline_visible\': False}" domain="[(\'date_deadline\',\'&lt;&gt;\',False)]" help="Show only tasks having a deadline"/>\n                    <field name="partner_id" modifiers="{}"/>\n                    <field name="project_id" modifiers="{}"/>\n                    <field name="user_id" modifiers="{}"/>\n                    <field name="stage_id" domain="[]" modifiers="{}"/>\n                    <group expand="0" string="Group By...">\n                        <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]" context="{\'group_by\':\'user_id\'}"/>\n                        <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{\'group_by\':\'project_id\'}"/>\n                        <filter string="Stage" name="group_stage_id" icon="terp-stage" domain="[]" context="{\'group_by\':\'stage_id\'}"/>\n                        <filter string="Last Stage Update" icon="terp-go-month" domain="[]" context="{\'group_by\':\'date_last_stage_update\'}"/>\n                        <filter string="Deadline" icon="terp-gnome-cpu-frequency-applet+" domain="[]" context="{\'group_by\':\'date_deadline\'}"/>\n                        <filter string="Start Month" icon="terp-go-month" domain="[]" context="{\'group_by\':\'date_start\'}"/>\n                        <filter string="End Month" icon="terp-go-month" domain="[]" context="{\'group_by\':\'date_end\'}" invisible="1" modifiers="{&quot;invisible&quot;: true}"/>\n                    </group>\n                </search>', 'model': 'project.task', 'type': u'search', 'view_id': 288, 'field_parent': False}"
-search_view_id: Array[2]
-src_model: false
-target: "current"
-type: "ir.actions.act_window"
-usage: false
-view_id: false
-view_ids: Array[0]
-view_mode: "kanban,list,form,calendar,gantt,graph"
-views: Array[6]
-__proto__: Object
-*/
-
             if (this.field.type === "one2many") {
                 context["default_" + this.field.relation_field] = this.view.datarecord.id;
+            } else if (this.field.type === "many2many") {
+                context["default_" + this.field.relation_field] = [6, 0, [this.view.datarecord.id]];
             }
             context["search_default_"+ this.field.relation_field] = [this.view.datarecord.id];
             return this.do_action({
                 type: 'ir.actions.act_window',
-                auto_search: true,
                 name: this.string,
                 res_model: this.field.relation,
                 res_id: val.length >= 1 ? val[0] : false,
                 res_ids: val,
                 views: this.options.views,
                 target: 'current',
-                context: {},
+                context: context,
             });
         }, this));
     },
-- 
cgit v1.2.3


From 8d2f37ec8bd42d6e593cdbcaec3028cce1730274 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 7 Oct 2013 13:56:38 +0200
Subject: wip

bzr revid: nicolas.vanhoren@openerp.com-20131007115638-9b82rw1azwjtp5fr
---
 addons/web/static/src/js/view_form.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 859c78d7217..06c700eb280 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -5721,19 +5721,16 @@ instance.web.form.X2ManyCounter = instance.web.form.AbstractField.extend(instanc
             var context = {};
             if (this.field.type === "one2many") {
                 context["default_" + this.field.relation_field] = this.view.datarecord.id;
-            } else if (this.field.type === "many2many") {
-                context["default_" + this.field.relation_field] = [6, 0, [this.view.datarecord.id]];
             }
-            context["search_default_"+ this.field.relation_field] = [this.view.datarecord.id];
+            var domain = [["id", "in", val]];
             return this.do_action({
                 type: 'ir.actions.act_window',
                 name: this.string,
                 res_model: this.field.relation,
-                res_id: val.length >= 1 ? val[0] : false,
-                res_ids: val,
                 views: this.options.views,
                 target: 'current',
                 context: context,
+                domain: domain,
             });
         }, this));
     },
-- 
cgit v1.2.3


From 8b0193a3bc71be75fbfdaf9eff3665ddcfc05a13 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 8 Oct 2013 15:51:43 +0200
Subject: added doc

bzr revid: nicolas.vanhoren@openerp.com-20131008135143-8qjqwi3s23ld0wks
---
 addons/web/static/src/js/view_form.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 06c700eb280..c096dd884ad 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -5701,6 +5701,17 @@ instance.web.form.FieldMany2ManyCheckBoxes = instance.web.form.AbstractField.ext
     },
 });
 
+/**
+    This field can be applied on many2many and one2many. It is a read-only field that will display a single link whose name is
+    "<number of linked records> <label of the field>". When the link is clicked, it will redirect to another act_window
+    action on the model of the relation and show only the linked records.
+
+    Widget options:
+
+    * views: The views to display in the act_window action. Must be a list of tuples whose first element is the id of the view
+      to display (or False to take the default one) and the second element is the type of the view. Defaults to
+      [[false, "tree"], [false, "form"]] .
+*/
 instance.web.form.X2ManyCounter = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, {
     className: "oe_form_x2many_counter",
     init: function() {
-- 
cgit v1.2.3


From ffe8490aefa344cbf477ef7770a50a8cc3861a55 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 10 Oct 2013 11:11:25 +0200
Subject: Enabled sort in o2m

bzr revid: nicolas.vanhoren@openerp.com-20131010091125-0t1v8wmkrn8bnc5y
---
 addons/web/static/src/js/view_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index b9f1d91b700..0d4119af74b 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3542,7 +3542,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
                 _.extend(view.options, {
                     addable: null,
                     selectable: self.multi_selection,
-                    sortable: false,
+                    sortable: true,
                     import_enabled: false,
                     deletable: true
                 });
-- 
cgit v1.2.3


From cfcafee87cf8dc9e450c239d35512042e9670dd5 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 11 Oct 2013 11:54:24 +0200
Subject: [IMP] Added some documentation in the framwork.

bzr revid: nicolas.vanhoren@openerp.com-20131011095424-midppkv5czebt1f2
---
 addons/web/static/src/js/openerpframework.js | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/openerpframework.js b/addons/web/static/src/js/openerpframework.js
index 027452b42fb..062ecb8fe80 100644
--- a/addons/web/static/src/js/openerpframework.js
+++ b/addons/web/static/src/js/openerpframework.js
@@ -138,6 +138,7 @@ var openerp = {};
                 throw new Error("You can only instanciate objects with the 'new' operator");
             }
             // All construction is actually done in the init method
+            this._super = null;
             if (!initializing && this.init) {
                 var ret = this.init.apply(this, arguments);
                 if (ret) { return ret; }
@@ -385,6 +386,14 @@ var Events = openerp.Class.extend({
     }
 });
 
+/**
+    Mixin containing an event system. Events are also registered by specifying the target object
+    (the object which will receive the event when it is raised). Both the event-emitting object
+    and the target object store or reference to each other. This is used to correctly remove all
+    reference to the event handler when any of the object is destroyed (when the destroy() method
+    from ParentedMixin is called). Removing those references is necessary to avoid memory leak
+    and phantom events (events which are raised and sent to a previously destroyed object).
+*/
 openerp.EventDispatcherMixin = _.extend({}, openerp.ParentedMixin, {
     __eventDispatcherMixin: true,
     init: function() {
-- 
cgit v1.2.3


From 083d3fc91e149dae323e664b0ec1ff581125450b Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 11 Oct 2013 15:30:54 +0200
Subject: Added tests about timeouts and implemented it in jsonprpc2

bzr revid: nicolas.vanhoren@openerp.com-20131011133054-0dx3wxqcqbdocnlf
---
 addons/web/static/src/js/openerpframework.js | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/openerpframework.js b/addons/web/static/src/js/openerpframework.js
index 062ecb8fe80..ab10d304b30 100644
--- a/addons/web/static/src/js/openerpframework.js
+++ b/addons/web/static/src/js/openerpframework.js
@@ -817,7 +817,7 @@ var genericJsonRpc = function(fct_name, params, fct) {
             return result.result;
         }
     }, function() {
-        console.error("JsonRPC communication error", _.toArray(arguments));
+        //console.error("JsonRPC communication error", _.toArray(arguments));
         var def = $.Deferred();
         return def.reject.apply(def, ["communication"].concat(_.toArray(arguments)));
     });
@@ -899,11 +899,29 @@ openerp.jsonpRpc = function(url, fct_name, params, settings) {
             });
             // append the iframe to the DOM (will trigger the first load)
             $form.after($iframe);
+            if (settings.timeout) {
+                realSetTimeout(function() {
+                    deferred.reject({});
+                }, settings.timeout);
+            }
             return deferred;
         }
     });
 };
 
+var realSetTimeout = function(fct, millis) {
+    var finished = new Date().getTime() + millis;
+    var wait = function() {
+        var current = new Date().getTime();
+        if (current < finished) {
+            setTimeout(wait, finished - current);
+        } else {
+            fct();
+        }
+    };
+    setTimeout(wait, millis);
+};
+
 openerp.Session = openerp.Class.extend(openerp.PropertiesMixin, {
     triggers: {
         'request': 'Request sent',
-- 
cgit v1.2.3


From 7d2938394fab7e47f8c0e75d710ada5f06c7a431 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 14 Oct 2013 17:57:09 +0200
Subject: [FIX] null >= 0 is true...

bzr revid: xmo@openerp.com-20131014155709-9cg4bzof02bhtyts
---
 addons/web/static/src/js/view_list.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 74c2fc47aee..4faf5dce1ec 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -503,10 +503,14 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
         var reloaded = $.Deferred();
         this.$el.find('.oe_list_content').append(
             this.groups.render(function () {
-                if (self.dataset.index == null && self.records.length ||
-                    self.dataset.index >= self.records.length) {
+                if (self.dataset.index == null) {
+                    if (self.records.length) {
                         self.dataset.index = 0;
+                    }
+                } else if (self.dataset.index >= self.records.length) {
+                    self.dataset.index = 0;
                 }
+
                 self.compute_aggregates();
                 reloaded.resolve();
             }));
-- 
cgit v1.2.3


From 7040fb35dd8fcba26ca74566fa0d64e7ef07ffbb Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 15 Oct 2013 10:55:23 +0200
Subject: [FIX] double-escaping of section labels in m2o completion

bzr revid: xmo@openerp.com-20131015085523-5s5f587486gaa9zj
---
 addons/web/static/src/js/search.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 07d1407392e..570c17649c1 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1547,7 +1547,7 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({
             context: context
         }).then(function (results) {
             if (_.isEmpty(results)) { return null; }
-            return [{label: _.escape(self.attrs.string)}].concat(
+            return [{label: self.attrs.string}].concat(
                 _(results).map(function (result) {
                     return {
                         label: _.escape(result[1]),
-- 
cgit v1.2.3


From eb98ba3fd6a806ec062046983a4715f58b92b37c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 17 Oct 2013 11:43:55 +0200
Subject: [FIX] list_view: when composing the active_domain in list view
 because of the list header being checked, also take into account the current
 action domain;

bzr revid: tde@openerp.com-20131017094355-murxot4rqirw3g68
---
 addons/web/static/src/js/view_list.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index f9ec22bf712..9c613935aa1 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -802,9 +802,11 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
     },
     /**
      * Calculate the active domain of the list view. This should be done only
-     * if the header checkbox has been checked.
+     * if the header checkbox has been checked. This is done by evaluating the
+     * search results, and then adding the dataset domain (i.e. action domain).
      */
     get_active_domain: function () {
+        var self = this;
         if (this.$('.oe_list_record_selector').prop('checked')) {
             var search_view = this.getParent().searchview;
             var search_data = search_view.build_search_data();
@@ -813,7 +815,8 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
                 contexts: search_data.contexts,
                 group_by_seq: search_data.groupbys || []
             }).then(function (results) {
-                return results.domain;
+                var domain = self.dataset.domain.concat(results.domain || []);
+                return domain
             });
         }
         else {
-- 
cgit v1.2.3


From 3333c5c329d8f2644ec0a334b56c92fd5a6ddade Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 17 Oct 2013 11:44:57 +0200
Subject: [IMP] data_export: when exporting on active_domain instead of
 selected ids, display a message to tell the user what he is doing.

bzr revid: tde@openerp.com-20131017094457-q1b7j3927eeoy4fo
---
 addons/web/static/src/js/data_export.js | 48 ++++++++++++++++++---------------
 addons/web/static/src/xml/base.xml      |  8 ++++++
 2 files changed, 35 insertions(+), 21 deletions(-)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js
index f642f0a334d..2725e18ea6e 100644
--- a/addons/web/static/src/js/data_export.js
+++ b/addons/web/static/src/js/data_export.js
@@ -62,8 +62,21 @@ instance.web.DataExport = instance.web.Dialog.extend({
             });
         }).change();
 
+        var got_domain = this.getParent().get_active_domain().then(function (domain) {
+            if (domain === undefined) {
+                self.ids_to_export = self.getParent().get_selected_ids();
+                self.domain = self.dataset.domain;
+            }
+            else {
+                self.ids_to_export = false;
+                self.domain = domain;
+            }
+            self.on_show_domain();
+        });
+
         return $.when(
             got_fields,
+            got_domain,
             this.rpc('/web/export/formats', {}).done(this.do_setup_export_formats),
             this.show_exports_list());
     },
@@ -196,6 +209,9 @@ instance.web.DataExport = instance.web.Dialog.extend({
             self.showcontent(record.id);
         }
     },
+    on_show_domain: function() {
+        this.$el.find('tr').first().find('td').append(QWeb.render('ExportTreeView-Domain', {'record': this}));
+    },
     on_show_data: function(result, after) {
         var self = this;
 
@@ -384,27 +400,17 @@ instance.web.DataExport = instance.web.Dialog.extend({
 
         var export_format = this.$el.find("#export_format").val();
 
-        this.getParent().get_active_domain().then(function (domain) {
-            if (domain === undefined) {
-                var ids_to_export = self.getParent().get_selected_ids();
-                var domain = self.dataset.domain;
-            }
-            else {
-                var ids_to_export = false;
-                var domain = domain;
-            }
-            instance.web.blockUI();
-            self.session.get_file({
-                url: '/web/export/' + export_format,
-                data: {data: JSON.stringify({
-                    model: self.dataset.model,
-                    fields: exported_fields,
-                    ids: ids_to_export,
-                    domain: domain,
-                    import_compat: !!self.$el.find("#import_compat").val(),
-                })},
-                complete: instance.web.unblockUI,
-            });
+        instance.web.blockUI();
+        this.session.get_file({
+            url: '/web/export/' + export_format,
+            data: {data: JSON.stringify({
+                model: this.dataset.model,
+                fields: exported_fields,
+                ids: this.ids_to_export,
+                domain: this.domain,
+                import_compat: !!this.$el.find("#import_compat").val(),
+            })},
+            complete: instance.web.unblockUI,
         });
     },
     close: function() {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index ee87237d045..8977e96ee88 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1775,6 +1775,14 @@
         </td>
     </tr>
 </table>
+<t t-name="ExportTreeView-Domain">
+    <t t-if="! record.ids_to_export">
+        <p><strong>Please pay attention that all records matching your search filter will be exported. Not only the selected ids.</strong></p>
+    </t>
+    <t t-if="record.ids_to_export">
+        <p><strong>Please note that only the selected ids will be exported.</strong></p>
+    </t>
+</t>
 <table t-name="ExportTreeView-Secondary"
        id="field-tree-structure" class="oe_export_fields_selector_export"
        cellspacing="0" cellpadding="0">
-- 
cgit v1.2.3


From 685c4f4d4ca68f30d6278e319a33cb7531123486 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Fri, 18 Oct 2013 11:33:07 +0200
Subject: [FIX] dropdown menu: compute document width *before* showing the
 dropdown menu

bzr revid: chs@openerp.com-20131018093307-plgk3y4qugv4o784
---
 addons/web/static/src/js/chrome.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 11a2e58ae5b..3727b011943 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1247,6 +1247,7 @@ instance.web.Client = instance.web.Widget.extend({
         this.$el.on('click', '.oe_dropdown_toggle', function(ev) {
             ev.preventDefault();
             var $toggle = $(this);
+            var doc_width = $(document).width();
             var $menu = $toggle.siblings('.oe_dropdown_menu');
             $menu = $menu.size() >= 1 ? $menu : $toggle.find('.oe_dropdown_menu');
             var state = $menu.is('.oe_opened');
@@ -1255,7 +1256,6 @@ instance.web.Client = instance.web.Widget.extend({
                 $toggle.add($menu).toggleClass('oe_opened', !state);
                 if (!state) {
                     // Move $menu if outside window's edge
-                    var doc_width = $(document).width();
                     var offset = $menu.offset();
                     var menu_width = $menu.width();
                     var x = doc_width - offset.left - menu_width - 2;
-- 
cgit v1.2.3


From 3853f642ff327f886086c7a766cdf76da7a2b906 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Fri, 18 Oct 2013 11:43:36 +0200
Subject: [FIX] web: correct StatusField widget to use dropdown menu

bzr revid: chs@openerp.com-20131018094336-3s8s3uggs60jwkl0
---
 addons/web/static/src/css/base.css    | 34 ++++++++++-----------------------
 addons/web/static/src/css/base.sass   | 36 ++++++++++++-----------------------
 addons/web/static/src/js/view_form.js |  2 +-
 addons/web/static/src/xml/base.xml    |  6 +++---
 4 files changed, 26 insertions(+), 52 deletions(-)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 51c3fd30f3c..5420462cbf1 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -700,10 +700,8 @@
 .openerp .oe_dropdown_menu {
   display: none;
   position: absolute;
-  top: 26px;
   z-index: 3;
   margin: 0;
-  padding: 0;
   border: 1px solid #afafb6;
   background: white;
   padding: 4px 0;
@@ -1116,7 +1114,7 @@
   border-color: #999999;
   border-color: rgba(0, 0, 0, 0.2);
   border-style: solid;
-  border-width: 0 1px 1px;
+  border-width: 0 2px 1px;
   -moz-border-radius: 0 0 6px 6px;
   -webkit-border-radius: 0 0 6px 6px;
   border-radius: 0 0 6px 6px;
@@ -2736,32 +2734,20 @@
   -o-transform: rotate(45deg);
   transform: rotate(45deg);
 }
-.openerp ul.oe_form_status .oe_folded .label, .openerp ul.oe_form_status_clickable .oe_folded .label {
-  padding-bottom: 8px;
-}
-.openerp ul.oe_form_status .oe_folded ul, .openerp ul.oe_form_status_clickable .oe_folded ul {
-  position: absolute;
-  z-index: 1000;
-  border-top: 1px solid #cacaca;
-  float: none;
-  top: 30px;
-  right: 0;
+.openerp ul.oe_form_status ul.oe_dropdown_menu, .openerp ul.oe_form_status_clickable ul.oe_dropdown_menu {
   display: none;
+  padding: 0;
+  min-width: 0;
 }
-.openerp ul.oe_form_status .oe_folded ul li, .openerp ul.oe_form_status_clickable .oe_folded ul li {
-  margin: 0;
-  border-left: 1px solid #cacaca;
+.openerp ul.oe_form_status ul.oe_dropdown_menu.oe_opened, .openerp ul.oe_form_status_clickable ul.oe_dropdown_menu.oe_opened {
   display: block;
 }
-.openerp ul.oe_form_status .oe_folded ul li.label, .openerp ul.oe_form_status_clickable .oe_folded ul li.label {
-  border: 0;
-  padding-left: 24px;
-}
-.openerp ul.oe_form_status .oe_folded ul li:last-child, .openerp ul.oe_form_status_clickable .oe_folded ul li:last-child {
-  border-bottom: 1px solid #cacaca;
+.openerp ul.oe_form_status ul.oe_dropdown_menu li, .openerp ul.oe_form_status_clickable ul.oe_dropdown_menu li {
+  margin: 0;
+  width: 100%;
 }
-.openerp ul.oe_form_status .oe_folded:hover ul, .openerp ul.oe_form_status_clickable .oe_folded:hover ul {
-  display: block;
+.openerp ul.oe_form_status ul.oe_dropdown_menu li span.label, .openerp ul.oe_form_status_clickable ul.oe_dropdown_menu li span.label {
+  padding-left: 14px;
 }
 .openerp ul.oe_form_status li.oe_active, .openerp ul.oe_form_status_clickable li.oe_active {
   background-color: #5382b9;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index a0231387e7f..5900eb9d268 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -606,10 +606,8 @@ $sheet-padding: 16px
     .oe_dropdown_menu
         display: none
         position: absolute
-        top: 26px
         z-index: 3
         margin: 0
-        padding: 0
         border: 1px solid $tag-border
         background: white
         padding: 4px 0
@@ -914,7 +912,7 @@ $sheet-padding: 16px
             border-color: #999
             border-color: rgba(0, 0, 0, 0.2)
             border-style: solid
-            border-width: 0 1px 1px
+            border-width: 0 2px 1px
             @include radius(0 0 6px 6px)
             @include background-clip()
             li
@@ -2174,28 +2172,18 @@ $sheet-padding: 16px
                     @include skew-gradient(#fcfcfc, #dedede)
                     @include radius(3px)
                     @include transform(rotate(45deg))
-        .oe_folded
-            .label
-                padding-bottom: 8px
-            ul
-                position: absolute
-                z-index: 1000
-                border-top: 1px solid #cacaca
-                float: none
-                top: 30px
-                right: 0
-                display: none
-                li
-                    margin: 0
-                    border-left: 1px solid #cacaca
-                    display: block
-                li.label
-                    border: 0
-                    padding-left: 24px
-                li:last-child
-                    border-bottom: 1px solid #cacaca
-            &:hover ul
+        ul.oe_dropdown_menu
+            display: none
+            padding: 0
+            min-width: 0
+            &.oe_opened
                 display: block
+            li
+                margin: 0
+                width: 100%
+                span.label
+                    padding-left: 14px
+
         li.oe_active
             @include vertical-gradient(#729fcf, #3465a4)
             > .arrow span
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 324896112cc..bcea1bf5bbe 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -5475,7 +5475,7 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
         });
         this.get_selection();
         if (this.options.clickable) {
-            this.$el.on('click','li:not(.oe_folded)',this.on_click_stage);
+            this.$el.on('click','li[data-id]',this.on_click_stage);
         }
         if (this.$el.parent().is('header')) {
             this.$el.after('<div class="oe_clear"/>');
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 8977e96ee88..6cbc3fb5692 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1228,9 +1228,9 @@
         </li>
     </t>
     <t t-if="widget.selection.folded.length">
-        <li t-att-class="value_folded ? 'oe_active oe_folded' : 'oe_folded'">
-            <span class="label"> ... </span>
-            <ul>
+        <li>
+            <span class="label oe_dropdown_toggle oe_dropdown_arrow">More</span>
+            <ul class="oe_dropdown_menu">
                 <t t-foreach="widget.selection.folded" t-as="i">
                     <li t-att-class="i[0] === widget.get('value') ? 'oe_active' : ''" t-att-data-id="i[0]">
                         <span class="label"><t t-esc="i[1]"/></span>
-- 
cgit v1.2.3


From 752341f0cb0bb4c77591d66aa9570bdaabbd1b4e Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 22 Oct 2013 18:25:19 +0200
Subject: [FIX]web: filter name input for custom filters in search dropdown is
 now required

bzr revid: dle@openerp.com-20131022162519-u03cn5k5od8jg6ka
---
 addons/web/static/src/js/search.js | 5 ++++-
 addons/web/static/src/xml/base.xml | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 570c17649c1..78f53506abc 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1733,7 +1733,10 @@ instance.web.search.CustomFilters = instance.web.search.Input.extend({
         var $name = this.$('input:first');
         var private_filter = !this.$('#oe_searchview_custom_public').prop('checked');
         var set_as_default = this.$('#oe_searchview_custom_default').prop('checked');
-
+        if (_.isEmpty($name.val())){
+            this.do_warn(_t("Error"), _t("Filter name is required."));
+            return false;
+        }
         var search = this.view.build_search_data();
         instance.web.pyeval.eval_domains_and_contexts({
             domains: search.domains,
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index c5bc624c2b1..2b8d6fe5efa 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1620,8 +1620,8 @@
         <ul class="oe_searchview_custom_list"/>
         <div class="oe_searchview_custom">
             <h4>Save current filter</h4>
-            <form>
-                <p><input id="oe_searchview_custom_input" placeholder="Filter name"/></p>
+            <form class="oe_form">
+                <p class="oe_form_required"><input id="oe_searchview_custom_input" placeholder="Filter name"/></p>
                 <p>
                     <input id="oe_searchview_custom_public" type="checkbox"/>
                     <label for="oe_searchview_custom_public">Share with all users</label>
-- 
cgit v1.2.3


From d524b95172f51f22f7d56f503a72f930de573271 Mon Sep 17 00:00:00 2001
From: xmo <>
Date: Fri, 25 Oct 2013 16:55:19 +0200
Subject: [FIX] list view: serialize concurrent calls when loading files and
 ensure consistency of variables (prevent selection of items in list view
 lost, opw #599969)

bzr revid: mat@openerp.com-20131025145519-jio03azp64ppi5ro
---
 addons/web/static/src/js/view_list.js | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 4faf5dce1ec..e2909815324 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -496,7 +496,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
      *
      * @returns {$.Deferred} promise to content reloading
      */
-    reload_content: function () {
+    reload_content: synchronized(function () {
         var self = this;
         self.$el.find('.oe_list_record_selector').prop('checked', false);
         this.records.reset();
@@ -519,7 +519,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
             limit: this._limit
         });
         return reloaded.promise();
-    },
+    }),
     reload: function () {
         return this.reload_content();
     },
@@ -1601,6 +1601,22 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
     }
 });
 
+/**
+ * Serializes concurrent calls to this asynchronous method. The method must
+ * return a deferred or promise.
+ *
+ * Current-implementation is class-serialized (the mutex is common to all
+ * instances of the list view). Can be switched to instance-serialized if
+ * having concurrent list views becomes possible and common.
+ */
+function synchronized(fn) {
+    var fn_mutex = new $.Mutex();
+    return function () {
+        var args = _.toArray(arguments);
+        args.unshift(this);
+        return fn_mutex.exec(fn.bind.apply(fn, args));
+    };
+}
 var DataGroup =  instance.web.Class.extend({
    init: function(parent, model, domain, context, group_by, level) {
        this.model = new instance.web.Model(model, context, domain);
-- 
cgit v1.2.3


From 9edf16f6690f14a98c39d7b24ab5e8ece7b53a88 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 28 Oct 2013 15:16:47 +0100
Subject: [FIX] list: force recompute the selection as closing group reset
 properties (opw #599969)

bzr revid: mat@openerp.com-20131028141647-j6wkvl6plwblh077
---
 addons/web/static/src/js/view_list.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index e2909815324..02d0b21d29c 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -1332,6 +1332,9 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
                                 .removeClass('ui-icon-triangle-1-s')
                                 .addClass('ui-icon-triangle-1-e');
                         child.close();
+                        // force recompute the selection as closing group reset properties
+                        var selection = self.get_selection();
+                        $(self).trigger('selected', [selection.ids, this.records]);
                     }
                 });
             }
-- 
cgit v1.2.3


From a237b0525d546667fbbde2655b80deccdfeec981 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 30 Oct 2013 19:02:42 +0100
Subject: [FIX] web: allow grouping on fields not present in list view [FIX]
 web,web_kanban: read_group: ensure read grouping fields

bzr revid: chs@openerp.com-20131030180242-rxxlawffv13ll5s1
---
 addons/web/static/src/js/view_list.js | 37 +++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 13 deletions(-)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 02d0b21d29c..d5e9ef501bf 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -1345,22 +1345,29 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
             if (group.grouped_on) {
                 var row_data = {};
                 row_data[group.grouped_on] = group;
+                var group_label = _t("Undefined");
                 var group_column = _(self.columns).detect(function (column) {
                     return column.id === group.grouped_on; });
-                if (! group_column) {
-                    throw new Error(_.str.sprintf(
-                        _t("Grouping on field '%s' is not possible because that field does not appear in the list view."),
-                        group.grouped_on));
-                }
-                var group_label;
-                try {
-                    group_label = group_column.format(row_data, {
-                        value_if_empty: _t("Undefined"),
-                        process_modifiers: false
-                    });
-                } catch (e) {
-                    group_label = _.str.escapeHTML(row_data[group_column.id].value);
+                if (group_column) {
+                    try {
+                        group_label = group_column.format(row_data, {
+                            value_if_empty: _t("Undefined"),
+                            process_modifiers: false
+                        });
+                    } catch (e) {
+                        group_label = _.str.escapeHTML(row_data[group_column.id].value);
+                    }
+                } else {
+                    group_label = group.value;
+                    if (group_label instanceof Array) {
+                        group_label = group_label[1];
+                    }
+                    if (group_label === false) {
+                        group_label = _t('Undefined');
+                    }
+                    group_label = _.str.escapeHTML(group_label);
                 }
+                    
                 // group_label is html-clean (through format or explicit
                 // escaping if format failed), can inject straight into HTML
                 $group_column.html(_.str.sprintf(_t("%s (%d)"),
@@ -1631,6 +1638,10 @@ var DataGroup =  instance.web.Class.extend({
    },
    list: function (fields, ifGroups, ifRecords) {
        var self = this;
+       if (!_.isEmpty(this.group_by)) {
+           // ensure group_by fields are read.
+           fields = _.unique((fields || []).concat(this.group_by));
+       }
        var query = this.model.query(fields).order_by(this.sort).group_by(this.group_by);
        $.when(query).done(function (querygroups) {
            // leaf node
-- 
cgit v1.2.3


From 3213ad4dddfee0333b66076b6955c7464c6421c1 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 5 Nov 2013 13:18:43 +0100
Subject: [FIX] web: instance.web.DataSetSearch.get_domain() returns the
 domain.

lp bug: https://launchpad.net/bugs/1195631 fixed

bzr revid: chs@openerp.com-20131105121843-rqplhk83fczxww0t
---
 addons/web/static/src/js/data.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index e535be294aa..bb658a27bf6 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -724,7 +724,7 @@ instance.web.DataSetSearch =  instance.web.DataSet.extend({
         });
     },
     get_domain: function (other_domain) {
-        this._model.domain(other_domain);
+        return this._model.domain(other_domain);
     },
     alter_ids: function (ids) {
         this._super(ids);
-- 
cgit v1.2.3


From 61a8a22f602d735fc891c36033ff0a48b8fb1a42 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 12 Nov 2013 15:36:35 +0100
Subject: [FIX] web: match base.sass against changes made in base.css in revid
 4014 mat@openerp.com-20130821080933-fiq3zvccgzop02on

bzr revid: chs@openerp.com-20131112143635-ek6yhfifb6ycynku
---
 addons/web/static/src/css/base.sass | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index b2cca813331..6add7a3174b 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1877,6 +1877,7 @@ $sheet-padding: 16px
             width: 100%
             display: inline-block
             padding: 2px 2px 2px 0px
+            vertical-align: top
             input
                 margin: 0px
         input[type="text"], input[type="password"], input[type="file"], select
-- 
cgit v1.2.3


From 6cfb4a03707a5f3330cdfaf369b650a4e0054d6b Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 12 Nov 2013 15:37:46 +0100
Subject: [FIX] web: do not enforce width of dropdown links

bzr revid: chs@openerp.com-20131112143746-svdfuqvzvvis6vpy
---
 addons/web/static/src/css/base.css  | 3 ---
 addons/web/static/src/css/base.sass | 3 ---
 2 files changed, 6 deletions(-)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 9e77fc316b5..edd4d4869a5 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -718,9 +718,6 @@
   display: block;
   color: #4c4c4c;
   text-decoration: none;
-  width: 200px;
-  text-overflow: ellipsis;
-  overflow: hidden;
 }
 .openerp .oe_dropdown_menu > li > a:hover {
   text-decoration: none;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 6add7a3174b..4814e64c590 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -611,9 +611,6 @@ $sheet-padding: 16px
                 display: block
                 color: #4c4c4c
                 text-decoration: none
-                width: 200px
-                text-overflow: ellipsis
-                overflow: hidden
                 &:hover
                     text-decoration: none
     .oe_dropdown_arrow:after
-- 
cgit v1.2.3


From 8c3cdce539d87775b59b3f2d5ceb433f995821bf Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 13 Nov 2013 09:28:06 +0100
Subject: [MERGE] view form: reduce the number of result in 'search more' view
 opening to 160 records (performances improvement, not filtering every
 possible record) (opw 593963)

bzr revid: mat@openerp.com-20131113082806-me6uy7cjj6holn56
---
 addons/web/static/src/js/view_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 0d4119af74b..bd04b4c75d0 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2934,7 +2934,7 @@ instance.web.form.CompletionFieldMixin = {
                 values.push({
                     label: _t("Search More..."),
                     action: function() {
-                        dataset.name_search(search_val, self.build_domain(), 'ilike', false).done(function(data) {
+                        dataset.name_search(search_val, self.build_domain(), 'ilike', 160).done(function(data) {
                             self._search_create_popup("search", data);
                         });
                     },
-- 
cgit v1.2.3


From e5ca5a170ce2525e504d864d5041d17be96c4343 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 14 Nov 2013 12:08:47 +0100
Subject: [FIX] web: list views: bubble up failed deferreds. [FIX] web: list
 view group: always call post_render method

lp bug: https://launchpad.net/bugs/1248531 fixed

bzr revid: chs@openerp.com-20131114110847-nn382fc60s7u7wp1
---
 addons/web/static/src/js/view_list.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index d5e9ef501bf..b9c789cb6a9 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -1439,14 +1439,13 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
 
         var view = this.view,
            limit = view.limit(),
-               d = new $.Deferred(),
             page = this.datagroup.openable ? this.page : view.page;
 
         var fields = _.pluck(_.select(this.columns, function(x) {return x.tag == "field"}), 'name');
         var options = { offset: page * limit, limit: limit, context: {bin_size: true} };
         //TODO xmo: investigate why we need to put the setTimeout
-        $.async_when().done(function() {
-            dataset.read_slice(fields, options).done(function (records) {
+        return $.async_when().then(function() {
+            return dataset.read_slice(fields, options).then(function (records) {
                 // FIXME: ignominious hacks, parents (aka form view) should not send two ListView#reload_content concurrently
                 if (self.records.length) {
                     self.records.reset(null, {silent: true});
@@ -1478,13 +1477,12 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
 
                 self.records.add(records, {silent: true});
                 list.render();
-                d.resolve(list);
                 if (_.isEmpty(records)) {
                     view.no_result();
                 }
+                return list;
             });
         });
-        return d.promise();
     },
     setup_resequence_rows: function (list, dataset) {
         // drag and drop enabled if list is not sorted and there is a
@@ -1564,11 +1562,12 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
                     self.render_groups(groups));
                 if (post_render) { post_render(); }
             }, function (dataset) {
-                self.render_dataset(dataset).done(function (list) {
+                self.render_dataset(dataset).then(function (list) {
                     self.children[null] = list;
                     self.elements =
                         [list.$current.replaceAll($el)[0]];
                     self.setup_resequence_rows(list, dataset);
+                }).always(function() {
                     if (post_render) { post_render(); }
                 });
             });
-- 
cgit v1.2.3


From 1e4b2695d59b9d51cc1e0b76f925aa4f638436f4 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 14 Nov 2013 15:26:39 +0100
Subject: [MERGE][FIX] web: fix race condition in BufferedDataset.

Backport of saas-2 commit 3867 nicolas.vanhoren@openerp.com-20131107112017-7omd01ocvnbzx9m6

lp bug: https://launchpad.net/bugs/1248531 fixed

bzr revid: chs@openerp.com-20131114142639-ng7wzfjwvvel2nhv
---
 addons/web/static/src/js/data.js | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

(limited to 'addons/web/static/src')

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index bb658a27bf6..d497cf25343 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -761,6 +761,7 @@ instance.web.BufferedDataSet = instance.web.DataSetStatic.extend({
         this._super.apply(this, arguments);
         this.reset_ids([]);
         this.last_default_get = {};
+        this.running_reads = [];
     },
     default_get: function(fields, options) {
         var self = this;
@@ -827,6 +828,9 @@ instance.web.BufferedDataSet = instance.web.DataSetStatic.extend({
         this.to_write = [];
         this.cache = [];
         this.delete_all = false;
+        _.each(_.clone(this.running_reads), function(el) {
+            el.reject();
+        });
     },
     read_ids: function (ids, fields, options) {
         var self = this;
@@ -842,7 +846,6 @@ instance.web.BufferedDataSet = instance.web.DataSetStatic.extend({
                     to_get.push(id);
             }
         });
-        var completion = $.Deferred();
         var return_records = function() {
             var records = _.map(ids, function(id) {
                 return _.extend({}, _.detect(self.cache, function(c) {return c.id === id;}).values, {"id": id});
@@ -877,10 +880,20 @@ instance.web.BufferedDataSet = instance.web.DataSetStatic.extend({
                     }, 0);
                 });
             }
-            completion.resolve(records);
+            return $.when(records);
         };
         if(to_get.length > 0) {
-            var rpc_promise = this._super(to_get, fields, options).done(function(records) {
+            var def = $.Deferred();
+            self.running_reads.push(def);
+            def.always(function() {
+                self.running_reads = _.without(self.running_reads, def);
+            });
+            this._super(to_get, fields, options).then(function() {
+                def.resolve.apply(def, arguments);
+            }, function() {
+                def.reject.apply(def, arguments);
+            });
+            return def.then(function(records) {
                 _.each(records, function(record, index) {
                     var id = to_get[index];
                     var cached = _.detect(self.cache, function(x) {return x.id === id;});
@@ -891,13 +904,11 @@ instance.web.BufferedDataSet = instance.web.DataSetStatic.extend({
                         cached.values = _.defaults(_.clone(cached.values), record);
                     }
                 });
-                return_records();
+                return return_records();
             });
-            $.when(rpc_promise).fail(function() {completion.reject();});
         } else {
-            return_records();
+            return return_records();
         }
-        return completion.promise();
     },
     /**
      * Invalidates caching of a record in the dataset to ensure the next read
-- 
cgit v1.2.3