audrius/web
1
0
Fork 1
mirror of https://github.com/OCA/web.git synced 2025-02-22 13:21:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] web_responsive: Close Menu on Discard

Browse Source
This commit is contained in:
Mathias Markl
2019-06-25 01:27:26 +02:00
committed by Sergey Shebanin
parent 37a3b4d3e1
commit 2ca39d3d41
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
web_responsive/readme/CONTRIBUTORS.rst
View File

@@ -3,3 +3,4 @@
* Dennis Sluijk <d.sluijk@onestein.nl> * Dennis Sluijk <d.sluijk@onestein.nl>
* Sergio Teruel <sergio.teruel@tecnativa.com> * Sergio Teruel <sergio.teruel@tecnativa.com>
* Alexandre Díaz <dev@redneboa.es> * Alexandre Díaz <dev@redneboa.es>
* Mathias Markl <mathias.markl@mukit.at>

5
web_responsive/static/src/js/web_responsive.js
View File

@@ -114,6 +114,8 @@ odoo.define('web_responsive', function (require) {
}, },
/** /**
* Prevent the menu from being opened twice
*
* @override * @override
*/ */
_onAppsMenuItemClicked: function (ev) { _onAppsMenuItemClicked: function (ev) {
@@ -288,11 +290,14 @@ odoo.define('web_responsive', function (require) {
BasicController.include({ BasicController.include({
/** /**
* Close the AppDrawer if the data set is dirty and a discard dialog is opened
*
* @override * @override
*/ */
canBeDiscarded: function (recordID) { canBeDiscarded: function (recordID) {
if (this.model.isDirty(recordID || this.handle)) { if (this.model.isDirty(recordID || this.handle)) {
$('.o_menu_apps .dropdown:has(.dropdown-menu.show) > a').dropdown('toggle'); $('.o_menu_apps .dropdown:has(.dropdown-menu.show) > a').dropdown('toggle');
$('.o_menu_sections li.show .dropdown-toggle').dropdown('toggle');
} }
return this._super.apply(this, arguments); return this._super.apply(this, arguments);
}, },