diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-07-04 13:16:34 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-07-04 13:16:34 +0200 |
| commit | 5a3a06f26ff598cdfdd5e1e19ec28ed3b7d5aebe (patch) | |
| tree | 58c173605e699a73d48aa1621b90aac873a57a15 /addons/web/static/src | |
| parent | 36ce0966003b3547aa1cf176d45737640a7f3e35 (diff) | |
| parent | d4d09df143bc12c2cbf2b5291299361402785905 (diff) | |
[MERGE] forward port of branch saas-11 up to d4d09df
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/menu.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/form_relational_widgets.js | 2 |
2 files changed, 2 insertions, 2 deletions
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'); } 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 8e65677a8b3..6e072333d6b 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(), []); |
