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

Merge PR #1311 into 12.0

Browse Source 
Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2019-07-04 14:52:23 +00:00
parent 1e26ee3788 01ffbdb12b
commit 99450497ed
5 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
web_responsive/README.rst
View File

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

2
web_responsive/__manifest__.py
View File

@@ -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, "

1
web_responsive/readme/CONTRIBUTORS.rst
View File

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

1
web_responsive/static/description/index.html
View File

@@ -492,6 +492,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
<li>Dennis Sluijk &lt;<a class="reference external" href="mailto:d.sluijk&#64;onestein.nl">d.sluijk&#64;onestein.nl</a>&gt;</li>
<li>Sergio Teruel &lt;<a class="reference external" href="mailto:sergio.teruel&#64;tecnativa.com">sergio.teruel&#64;tecnativa.com</a>&gt;</li>
<li>Alexandre Díaz &lt;<a class="reference external" href="mailto:dev&#64;redneboa.es">dev&#64;redneboa.es</a>&gt;</li>
<li>Mathias Markl &lt;<a class="reference external" href="mailto:mathias.markl&#64;mukit.at">mathias.markl&#64;mukit.at</a>&gt;</li>
</ul>
</div>
<div class="section" id="maintainers">

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

@@ -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,16 @@ odoo.define('web_responsive', function (require) {
return this._super.apply(this, arguments);
},
/**
* Prevent the menu from being opened twice
*
* @override
*/
_onAppsMenuItemClicked: function (ev) {
this._super.apply(this, arguments);
ev.preventDefault();
},
/**
* Get all info for a given menu.
*
@@ -276,6 +287,22 @@ 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);
},
});
Menu.include({
events: _.extend({
// Clicking a hamburger menu item should close the hamburger