pre-commit update
OCA-git-bot
Rodrigo
parent
572f4b5736
commit
720b1f02f4
|
|
@ -1,6 +1,6 @@
|
|||
// © 2017 Creu Blanca
|
||||
// License AGPL-3.0 or later (https://www.gnuorg/licenses/agpl.html).
|
||||
odoo.define("report_xlsx.report", function (require) {
|
||||
odoo.define("report_xlsx.report", function(require) {
|
||||
"use strict";
|
||||
|
||||
var core = require("web.core");
|
||||
|
|
@ -10,36 +10,39 @@ odoo.define("report_xlsx.report", function (require) {
|
|||
var _t = core._t;
|
||||
|
||||
ActionManager.include({
|
||||
|
||||
_downloadReportXLSX: function (url, actions) {
|
||||
_downloadReportXLSX: function(url, actions) {
|
||||
var self = this;
|
||||
framework.blockUI();
|
||||
var type = "xlsx";
|
||||
var cloned_action = _.clone(actions);
|
||||
var new_url = url;
|
||||
|
||||
if (_.isUndefined(cloned_action.data) ||
|
||||
if (
|
||||
_.isUndefined(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) {
|
||||
new_url += "/" + cloned_action.context.active_ids.join(',');
|
||||
new_url += "/" + cloned_action.context.active_ids.join(",");
|
||||
}
|
||||
} else {
|
||||
new_url += "?options=" + encodeURIComponent(
|
||||
JSON.stringify(cloned_action.data));
|
||||
new_url += "&context=" + encodeURIComponent(
|
||||
JSON.stringify(cloned_action.context));
|
||||
new_url +=
|
||||
"?options=" +
|
||||
encodeURIComponent(JSON.stringify(cloned_action.data));
|
||||
new_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({
|
||||
url: new_url,
|
||||
data: {
|
||||
data: JSON.stringify([new_url, type]),
|
||||
},
|
||||
success: resolve,
|
||||
error: (error) => {
|
||||
self.call('crash_manager', 'rpc_error', error);
|
||||
error: error => {
|
||||
self.call("crash_manager", "rpc_error", error);
|
||||
reject();
|
||||
},
|
||||
complete: framework.unblockUI,
|
||||
|
|
@ -48,44 +51,48 @@ odoo.define("report_xlsx.report", function (require) {
|
|||
// AAB: this check should be done in get_file service directly,
|
||||
// should not be the concern of the caller (and that way, get_file
|
||||
// could return a deferred)
|
||||
var message = _t('A popup window with your report was blocked. You ' +
|
||||
'may need to change your browser settings to allow ' +
|
||||
'popup windows for this page.');
|
||||
this.do_warn(_t('Warning'), message, true);
|
||||
var message = _t(
|
||||
"A popup window with your report was blocked. You " +
|
||||
"may need to change your browser settings to allow " +
|
||||
"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 reportUrls = this._makeReportUrls(action);
|
||||
if (type === "xlsx") {
|
||||
return this._downloadReportXLSX(reportUrls[type], action).then(
|
||||
function () {
|
||||
function() {
|
||||
if (action.close_on_report_download) {
|
||||
var closeAction = {type: 'ir.actions.act_window_close'};
|
||||
return self.doAction(closeAction, _.pick(
|
||||
options, 'on_close'));
|
||||
var closeAction = {type: "ir.actions.act_window_close"};
|
||||
return self.doAction(
|
||||
closeAction,
|
||||
_.pick(options, "on_close")
|
||||
);
|
||||
}
|
||||
return options.on_close();
|
||||
});
|
||||
}
|
||||
);
|
||||
}
|
||||
return this._super.apply(this, arguments);
|
||||
},
|
||||
|
||||
_makeReportUrls: function (action) {
|
||||
_makeReportUrls: function(action) {
|
||||
var reportUrls = this._super.apply(this, arguments);
|
||||
reportUrls.xlsx = '/report/xlsx/' + action.report_name;
|
||||
reportUrls.xlsx = "/report/xlsx/" + action.report_name;
|
||||
return reportUrls;
|
||||
},
|
||||
|
||||
_executeReportAction: function (action, options) {
|
||||
_executeReportAction: function(action, options) {
|
||||
var self = this;
|
||||
if (action.report_type === 'xlsx') {
|
||||
return self._triggerDownload(action, options, 'xlsx');
|
||||
if (action.report_type === "xlsx") {
|
||||
return self._triggerDownload(action, options, "xlsx");
|
||||
}
|
||||
return this._super.apply(this, arguments);
|
||||
},
|
||||
});
|
||||
|
||||
});
|
||||
|
|
|
|||
|
|
@ -6,8 +6,10 @@
|
|||
-->
|
||||
<template id="assets_backend" inherit_id="web.assets_backend">
|
||||
<xpath expr="." position="inside">
|
||||
<script type="text/javascript" src="/report_xlsx/static/src/js/report/action_manager_report.js"/>
|
||||
<script
|
||||
type="text/javascript"
|
||||
src="/report_xlsx/static/src/js/report/action_manager_report.js"
|
||||
/>
|
||||
</xpath>
|
||||
|
||||
</template>
|
||||
</odoo>
|
||||
|
|
|
|||
Loading…
Reference in New Issue