[MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 3747 rev-id: dle@openerp.com-20131018120136-fvoq337kgx74njsy

bzr revid: dle@openerp.com-20131018123253-pvf2tg747vflfp6x

5 files changed, 11 insertions, 6 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 5420462cbf1..87e129bb211 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1453,7 +1453,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 5900eb9d268..e8eab4544a6 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1169,7 +1169,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
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 6241fe6da28..e086678c937 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]),
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index bcea1bf5bbe..71c9b3f9f8f 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3664,7 +3664,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
                 });
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 9c613935aa1..ba7c58b3820 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -508,10 +508,15 @@ 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.dataset.index === undefined) && self.records.length ||
-                    self.dataset.index >= self.records.length) {
+                // Keep '=='. This is not a mistake, this is a wanted behaviour to match null & undefined
+                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();
             }));