[MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 3747 rev-id: dle@openerp...
authorDenis Ledoux <dle@openerp.com>
Fri, 18 Oct 2013 12:32:53 +0000 (14:32 +0200)
committerDenis Ledoux <dle@openerp.com>
Fri, 18 Oct 2013 12:32:53 +0000 (14:32 +0200)
bzr revid: dle@openerp.com-20131018123253-pvf2tg747vflfp6x

1  2 
addons/web/static/src/css/base.css
addons/web/static/src/css/base.sass
addons/web/static/src/js/search.js
addons/web/static/src/js/view_form.js
addons/web/static/src/js/view_list.js

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -508,10 -503,14 +508,15 @@@ instance.web.ListView = instance.web.Vi
          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();
              }));