Techsystech
/
OCA_Reporting_engine_17.0
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FIX] report_xlsx: js

pull/554/head
Joan Sisquella 2019-12-24 12:50:09 +01:00 committed by Lois Rilo
parent 67ecf5c597
commit 1ecde4ea83
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
report_xlsx/static/src/js/report/action_manager_report.js
View File

@ -5,7 +5,6 @@ odoo.define("report_xlsx.report", function (require) {
var core = require("web.core"); var core = require("web.core");
var ActionManager = require("web.ActionManager"); var ActionManager = require("web.ActionManager");
var crash_manager = require("web.crash_manager");
var framework = require("web.framework"); var framework = require("web.framework");
var session = require("web.session"); var session = require("web.session");
var _t = core._t; var _t = core._t;
@ -13,8 +12,8 @@ odoo.define("report_xlsx.report", function (require) {
ActionManager.include({ ActionManager.include({
_downloadReportXLSX: function (url, actions) { _downloadReportXLSX: function (url, actions) {
var self = this;
framework.blockUI(); framework.blockUI();
var def = $.Deferred();
var type = "xlsx"; var type = "xlsx";
var cloned_action = _.clone(actions); var cloned_action = _.clone(actions);
var new_url = url; var new_url = url;
@ -32,28 +31,29 @@ odoo.define("report_xlsx.report", function (require) {
JSON.stringify(cloned_action.context)); JSON.stringify(cloned_action.context));
} }
var blocked = !session.get_file({ return new Promise(function (resolve, reject) {
url: new_url, var blocked = !session.get_file({
data: { url: new_url,
data: JSON.stringify([new_url, type]), data: {
}, data: JSON.stringify([new_url, type]),
success: def.resolve.bind(def), },
error: function () { success: resolve,
crash_manager.rpc_error.apply(crash_manager, arguments); error: (error) => {
def.reject(); self.call('crash_manager', 'rpc_error', error);
}, reject();
complete: framework.unblockUI, },
complete: framework.unblockUI,
});
if (blocked) {
// 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);
}
}); });
if (blocked) {
// 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);
}
return def;
}, },
_triggerDownload: function (action, options, type) { _triggerDownload: function (action, options, type) {