From 607730850992b8b1bbf27a4172fb99c5e5ec9c24 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 9 Jul 2012 12:32:15 +0200 Subject: [PATCH] [WIP] Pop breadcrumb on mode switch != form bzr revid: fme@openerp.com-20120709103215-bemcmt5silu5u4je --- addons/web/static/src/js/views.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index e6d4047..7bf462f 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -130,6 +130,7 @@ instance.web.ActionManager = instance.web.Widget.extend({ null_action: function() { this.dialog_stop(); this.content_stop(); + this.breadcrumb.clear(); }, ir_actions_act_window: function (action, on_close) { var self = this; @@ -255,6 +256,7 @@ instance.web.BreadCrumb = instance.web.CallbackEnabled.extend({ var bookmarked_view = view_type || am.active_view || am.views_src[0].view_type; this.push({ widget: am, + view: bookmarked_view, show: function() { am.$element.show(); if (am.active_view !== bookmarked_view) { @@ -271,7 +273,10 @@ instance.web.BreadCrumb = instance.web.CallbackEnabled.extend({ if (mode === 'form') { self.push_actionmanager(am, 'form'); } else { - // select previous to form and remove form + var last = self.items[self.items.length - 1]; + if (last.widget === am && last.view === 'form') { + self.pop(); + } } }); } -- 1.7.10.4