From eb25ccef6c2df8de15f1862d809fbd345eb94e8b Mon Sep 17 00:00:00 2001 From: Mathias Markl Date: Sun, 23 Jun 2019 14:23:28 +0200 Subject: [PATCH 1/5] [FIX] web_responsive: AppDrawer Discard --- web_responsive/README.rst | 1 + web_responsive/static/src/js/web_responsive.js | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/web_responsive/README.rst b/web_responsive/README.rst index 6eae1ac6..ab87b38e 100644 --- a/web_responsive/README.rst +++ b/web_responsive/README.rst @@ -156,6 +156,7 @@ Contributors * Dennis Sluijk * Sergio Teruel * Alexandre Díaz +* Mathias Markl Maintainers ~~~~~~~~~~~ diff --git a/web_responsive/static/src/js/web_responsive.js b/web_responsive/static/src/js/web_responsive.js index f128f2c5..3619bbc5 100644 --- a/web_responsive/static/src/js/web_responsive.js +++ b/web_responsive/static/src/js/web_responsive.js @@ -278,6 +278,8 @@ odoo.define('web_responsive', function (require) { Menu.include({ events: _.extend({ + // Clicking on apps menu + "click .o_menu_apps a[data-toggle=dropdown]": "_onAppsMenuClick", // Clicking a hamburger menu item should close the hamburger "click .o_menu_sections [role=menuitem]": "_hideMobileSubmenus", // Opening any dropdown in the navbar should hide the hamburger @@ -324,6 +326,22 @@ odoo.define('web_responsive', function (require) { return this._super.apply(this, arguments); } }, + + /** + * Check if Controller can be removed + */ + _onAppsMenuClick: function(event, checkedCanBeRemoved) { + var action_manager = this.getParent().action_manager; + var controller = action_manager.getCurrentController(); + if (controller && !checkedCanBeRemoved) { + controller.widget.canBeRemoved().done(function () { + $(event.currentTarget).trigger('click', [true]); + $(event.currentTarget).off('.bs.dropdown'); + }); + event.stopPropagation(); + event.preventDefault(); + } + }, }); RelationalFields.FieldStatus.include({ From 086f9e7dfd9862596cf19ec00e497a3fc12cd8d2 Mon Sep 17 00:00:00 2001 From: Mathias Markl Date: Mon, 24 Jun 2019 11:39:51 +0200 Subject: [PATCH 2/5] [FIX] web_responsive: adapt AppDrawer Discard --- .../static/src/js/web_responsive.js | 40 ++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/web_responsive/static/src/js/web_responsive.js b/web_responsive/static/src/js/web_responsive.js index 3619bbc5..366e1871 100644 --- a/web_responsive/static/src/js/web_responsive.js +++ b/web_responsive/static/src/js/web_responsive.js @@ -7,6 +7,7 @@ odoo.define('web_responsive', function (require) { var ActionManager = require('web.ActionManager'); var AbstractWebClient = require("web.AbstractWebClient"); var AppsMenu = require("web.AppsMenu"); + var BasicController = require('web.BasicController'); var config = require("web.config"); var core = require("web.core"); var FormRenderer = require('web.FormRenderer'); @@ -112,6 +113,14 @@ odoo.define('web_responsive', function (require) { return this._super.apply(this, arguments); }, + /** + * @override + */ + _onAppsMenuItemClicked: function (ev) { + this._super.apply(this, arguments); + ev.preventDefault(); + }, + /** * Get all info for a given menu. * @@ -276,10 +285,21 @@ odoo.define('web_responsive', function (require) { }, }); + BasicController.include({ + + /** + * @override + */ + canBeDiscarded: function (recordID) { + if (this.model.isDirty(recordID || this.handle)) { + $('.o_menu_apps .dropdown:has(.dropdown-menu.show) > a').dropdown('toggle'); + } + return this._super.apply(this, arguments); + }, + }); + Menu.include({ events: _.extend({ - // Clicking on apps menu - "click .o_menu_apps a[data-toggle=dropdown]": "_onAppsMenuClick", // Clicking a hamburger menu item should close the hamburger "click .o_menu_sections [role=menuitem]": "_hideMobileSubmenus", // Opening any dropdown in the navbar should hide the hamburger @@ -326,22 +346,6 @@ odoo.define('web_responsive', function (require) { return this._super.apply(this, arguments); } }, - - /** - * Check if Controller can be removed - */ - _onAppsMenuClick: function(event, checkedCanBeRemoved) { - var action_manager = this.getParent().action_manager; - var controller = action_manager.getCurrentController(); - if (controller && !checkedCanBeRemoved) { - controller.widget.canBeRemoved().done(function () { - $(event.currentTarget).trigger('click', [true]); - $(event.currentTarget).off('.bs.dropdown'); - }); - event.stopPropagation(); - event.preventDefault(); - } - }, }); RelationalFields.FieldStatus.include({ From 00f09adf1b90fc81da15a9314569e151becfbf8d Mon Sep 17 00:00:00 2001 From: Mathias Markl Date: Tue, 25 Jun 2019 01:27:26 +0200 Subject: [PATCH 3/5] [FIX] web_responsive: Close Menu on Discard --- web_responsive/readme/CONTRIBUTORS.rst | 1 + web_responsive/static/src/js/web_responsive.js | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/web_responsive/readme/CONTRIBUTORS.rst b/web_responsive/readme/CONTRIBUTORS.rst index f7ba6bf5..d46ef948 100644 --- a/web_responsive/readme/CONTRIBUTORS.rst +++ b/web_responsive/readme/CONTRIBUTORS.rst @@ -3,3 +3,4 @@ * Dennis Sluijk * Sergio Teruel * Alexandre Díaz +* Mathias Markl diff --git a/web_responsive/static/src/js/web_responsive.js b/web_responsive/static/src/js/web_responsive.js index 366e1871..1851de9d 100644 --- a/web_responsive/static/src/js/web_responsive.js +++ b/web_responsive/static/src/js/web_responsive.js @@ -114,6 +114,8 @@ odoo.define('web_responsive', function (require) { }, /** + * Prevent the menu from being opened twice + * * @override */ _onAppsMenuItemClicked: function (ev) { @@ -288,11 +290,14 @@ odoo.define('web_responsive', function (require) { BasicController.include({ /** + * Close the AppDrawer if the data set is dirty and a discard dialog is opened + * * @override */ canBeDiscarded: function (recordID) { if (this.model.isDirty(recordID || this.handle)) { $('.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); }, From 31a3198cd2d1dfd637b811e876e3b54e93359339 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Thu, 4 Jul 2019 14:52:23 +0000 Subject: [PATCH 4/5] [UPD] README.rst --- web_responsive/static/description/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/web_responsive/static/description/index.html b/web_responsive/static/description/index.html index 979f020c..62d89182 100644 --- a/web_responsive/static/description/index.html +++ b/web_responsive/static/description/index.html @@ -492,6 +492,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
  • Dennis Sluijk <d.sluijk@onestein.nl>
  • Sergio Teruel <sergio.teruel@tecnativa.com>
  • Alexandre Díaz <dev@redneboa.es>
    • +
  • Mathias Markl <mathias.markl@mukit.at>
    • From 01ffbdb12b4c64ea627e34f3930a9a838d98017c Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Thu, 4 Jul 2019 14:52:23 +0000 Subject: [PATCH 5/5] web_responsive 12.0.1.1.2 --- web_responsive/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_responsive/__manifest__.py b/web_responsive/__manifest__.py index f190bd60..73722659 100644 --- a/web_responsive/__manifest__.py +++ b/web_responsive/__manifest__.py @@ -5,7 +5,7 @@ { "name": "Web Responsive", "summary": "Responsive web client, community-supported", - "version": "12.0.1.1.1", + "version": "12.0.1.1.2", "category": "Website", "website": "https://github.com/OCA/web", "author": "LasLabs, Tecnativa, Alexandre Díaz, "