From 2eebef8d41506f96f9f4a5d01aab4377d7bfa9b0 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Wed, 29 Jun 2016 13:58:20 +0200
Subject: [FIX] web: pager minimum on next/previous record

Since the deduplication of web addons (977db823c7c84e9edc7c8cf8384eb9cf47275b3a),
patch 9062c01c0298dd254197e5100ff9f23725f7e46f (freshly forward-ported)
is now useless. Apply odoo/enterprise@26adf4fe2cc89743e31f5540ef5de803185930a2 couterpart.
---
 addons/web/static/src/js/views/form_relational_widgets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/web/static/src/js/views/form_relational_widgets.js b/addons/web/static/src/js/views/form_relational_widgets.js
index e199e1b5e95..6274f0bc087 100644
--- a/addons/web/static/src/js/views/form_relational_widgets.js
+++ b/addons/web/static/src/js/views/form_relational_widgets.js
@@ -820,7 +820,7 @@ var FieldX2Many = AbstractManyField.extend({
         self.is_loaded = self.is_loaded.then(function() {
             var view = self.get_active_view();
             if (view.type === "list") {
-                view.controller.page = 0;
+                view.controller.current_min = 1;
                 return view.controller.reload_content();
             } else if (view.controller.do_search) {
                 return view.controller.do_search(self.build_domain(), self.dataset.get_context(), []);
-- 
cgit v1.2.3


From 811dd8f24cfef697a9d2296212c013815178265d Mon Sep 17 00:00:00 2001
From: Nicolas Lempereur <nle@odoo.com>
Date: Thu, 30 Jun 2016 09:30:06 +0200
Subject: [FIX] web: submenu need toggling of .o_hidden

Since dce2a309 submenus where hidden by using the class `o_hidden` but
this was not taken into account when showing them (so opening submenu
was not possible).
---
 addons/web/static/src/js/menu.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/web/static/src/js/menu.js b/addons/web/static/src/js/menu.js
index 83112ed3121..8eb1552cea4 100644
--- a/addons/web/static/src/js/menu.js
+++ b/addons/web/static/src/js/menu.js
@@ -167,7 +167,7 @@ var Menu = Widget.extend({
         if ($main_menu !== $clicked_menu) {
             $clicked_menu.parents().removeClass('o_hidden');
             if ($clicked_menu.is('.oe_menu_toggler')) {
-                $clicked_menu.toggleClass('oe_menu_opened').siblings('.oe_secondary_submenu:first').toggle();
+                $clicked_menu.toggleClass('oe_menu_opened').siblings('.oe_secondary_submenu:first').toggleClass('o_hidden');
             } else {
                 $clicked_menu.parent().addClass('active');
             }
-- 
cgit v1.2.3