pre-commit update

This commit is contained in:
OCA-git-bot
2020-03-14 12:20:19 +01:00
committed by ferran-73
parent 42d4e3e844
commit 5c018e9ce0
2 changed files with 43 additions and 32 deletions

View File

@@ -1,6 +1,6 @@
// © 2019 Creu Blanca // © 2019 Creu Blanca
// License AGPL-3.0 or later (https://www.gnuorg/licenses/agpl.html). // License AGPL-3.0 or later (https://www.gnuorg/licenses/agpl.html).
odoo.define("report_csv.report", function (require) { odoo.define("report_csv.report", function(require) {
"use strict"; "use strict";
var core = require("web.core"); var core = require("web.core");
@@ -10,34 +10,38 @@ odoo.define("report_csv.report", function (require) {
var _t = core._t; var _t = core._t;
ActionManager.include({ ActionManager.include({
_downloadReportCSV: function(url, actions) {
_downloadReportCSV: function (url, actions) {
var self = this; var self = this;
framework.blockUI(); framework.blockUI();
var type = "csv"; var type = "csv";
var cloned_action = _.clone(actions); var cloned_action = _.clone(actions);
if (_.isUndefined(cloned_action.data) || if (
_.isUndefined(cloned_action.data) ||
_.isNull(cloned_action.data) || _.isNull(cloned_action.data) ||
(_.isObject(cloned_action.data) && _.isEmpty(cloned_action.data))) (_.isObject(cloned_action.data) && _.isEmpty(cloned_action.data))
{ ) {
if (cloned_action.context.active_ids) { if (cloned_action.context.active_ids) {
url += "/" + cloned_action.context.active_ids.join(','); url += "/" + cloned_action.context.active_ids.join(",");
} }
} else { } else {
url += "?options=" + encodeURIComponent(JSON.stringify(cloned_action.data)); url +=
url += "&context=" + encodeURIComponent(JSON.stringify(cloned_action.context)); "?options=" +
encodeURIComponent(JSON.stringify(cloned_action.data));
url +=
"&context=" +
encodeURIComponent(JSON.stringify(cloned_action.context));
} }
return new Promise(function (resolve, reject) { return new Promise(function(resolve, reject) {
var blocked = !session.get_file({ var blocked = !session.get_file({
url: url, url: url,
data: { data: {
data: JSON.stringify([url, type]), data: JSON.stringify([url, type]),
}, },
success: resolve, success: resolve,
error: (error) => { error: error => {
self.call('crash_manager', 'rpc_error', error); self.call("crash_manager", "rpc_error", error);
reject(); reject();
}, },
complete: framework.unblockUI, complete: framework.unblockUI,
@@ -46,43 +50,48 @@ odoo.define("report_csv.report", function (require) {
// AAB: this check should be done in get_file service directly, // AAB: this check should be done in get_file service directly,
// should not be the concern of the caller (and that way, get_file // should not be the concern of the caller (and that way, get_file
// could return a deferred) // could return a deferred)
var message = _t('A popup window with your report was blocked. You ' + var message = _t(
'may need to change your browser settings to allow ' + "A popup window with your report was blocked. You " +
'popup windows for this page.'); "may need to change your browser settings to allow " +
this.do_warn(_t('Warning'), message, true); "popup windows for this page."
);
this.do_warn(_t("Warning"), message, true);
} }
}); });
}, },
_triggerDownload: function (action, options, type) { _triggerDownload: function(action, options, type) {
var self = this; var self = this;
var reportUrls = this._makeReportUrls(action); var reportUrls = this._makeReportUrls(action);
if (type === "csv") { if (type === "csv") {
return this._downloadReportCSV(reportUrls[type], action).then(function () { return this._downloadReportCSV(reportUrls[type], action).then(
function() {
if (action.close_on_report_download) { if (action.close_on_report_download) {
var closeAction = {type: 'ir.actions.act_window_close'}; var closeAction = {type: "ir.actions.act_window_close"};
return self.doAction(closeAction, _.pick(options, 'on_close')); return self.doAction(
} else { closeAction,
_.pick(options, "on_close")
);
}
return options.on_close(); return options.on_close();
} }
}); );
} }
return this._super.apply(this, arguments); return this._super.apply(this, arguments);
}, },
_makeReportUrls: function (action) { _makeReportUrls: function(action) {
var reportUrls = this._super.apply(this, arguments); var reportUrls = this._super.apply(this, arguments);
reportUrls.csv = '/report/csv/' + action.report_name; reportUrls.csv = "/report/csv/" + action.report_name;
return reportUrls; return reportUrls;
}, },
_executeReportAction: function (action, options) { _executeReportAction: function(action, options) {
var self = this; var self = this;
if (action.report_type === 'csv') { if (action.report_type === "csv") {
return self._triggerDownload(action, options, 'csv'); return self._triggerDownload(action, options, "csv");
} }
return this._super.apply(this, arguments); return this._super.apply(this, arguments);
} },
}); });
}); });

View File

@@ -6,8 +6,10 @@
--> -->
<template id="assets_backend" inherit_id="web.assets_backend"> <template id="assets_backend" inherit_id="web.assets_backend">
<xpath expr="." position="inside"> <xpath expr="." position="inside">
<script type="text/javascript" src="/report_csv/static/src/js/report/qwebactionmanager.js"/> <script
type="text/javascript"
src="/report_csv/static/src/js/report/qwebactionmanager.js"
/>
</xpath> </xpath>
</template> </template>
</odoo> </odoo>