From f55e4a5e1499dfc7ab134e0e8e769310a8c60898 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Fri, 27 Jun 2014 13:03:52 +0200
Subject: [FIX] web: no switch_mode trigger if not switched

The switch mode event was triggered even if the view was not actually switched
This leaded to inconsistencies, like adding the view in the breadcrumb history, while the switch did not happen
---
 addons/web/static/src/js/views.js | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 24c3d6097bb..df02686f8e5 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -579,7 +579,6 @@ instance.web.ViewManager =  instance.web.Widget.extend({
         var view_promise;
         var form = this.views['form'];
         if (!view || (form && form.controller && !form.controller.can_be_discarded())) {
-            self.trigger('switch_mode', view_type, no_store, view_options);
             return $.Deferred().reject();
         }
         if (!no_store) {
-- 
cgit v1.2.3


From 30ac7248d68319677c25721e1be4a0caa7b491c9 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 27 Jun 2014 15:28:34 +0200
Subject: [FIX] view_list: hide pager in view group

Displaying the pagert in view group does not make sense as it's not updated when changing filter and every group (even if more than 80) is displayed in view group
---
 addons/web/static/src/js/view_list.js | 1 +
 1 file changed, 1 insertion(+)

(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 4cf5cc6169b..3dad5b2e667 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -1573,6 +1573,7 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
                 .filter(function (column) { return column.tag === 'field' })
                 .pluck('name').value(),
             function (groups) {
+                self.view.$pager.hide();
                 $el[0].appendChild(
                     self.render_groups(groups));
                 if (post_render) { post_render(); }
-- 
cgit v1.2.3


From 95cff0ba3426932b687db333a73b8e4ef097b0ef Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 27 Jun 2014 15:43:11 +0200
Subject: [FIX] view_form: backport of commit
 180212b9996c049eacf06fd15b00087944fca869 (opw 609787)

---
 addons/web/static/src/js/view_form.js | 7 ++++++-
 1 file changed, 6 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 50ec791b7c7..2f3d5593bb4 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -5484,7 +5484,12 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
     on_click_stage: function (ev) {
         var self = this;
         var $li = $(ev.currentTarget);
-        var val = parseInt($li.data("id"));
+        if (this.field.type == "many2one") {
+            var val = parseInt($li.data("id"));
+        }
+        else {
+            var val = $li.data("id");
+        }
         if (val != self.get('value')) {
             this.view.recursive_save().done(function() {
                 var change = {};
-- 
cgit v1.2.3