mirror of
https://github.com/OCA/reporting-engine.git
synced 2025-02-16 16:30:38 +02:00
[FIX] report_py3o: prettier xml after merge with master
This commit is contained in:
committed by
ferran-73
parent
5c018e9ce0
commit
7b874a3e33
@@ -19,7 +19,7 @@ odoo.define("report_csv.report", function(require) {
|
|||||||
if (
|
if (
|
||||||
_.isUndefined(cloned_action.data) ||
|
_.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(",");
|
||||||
@@ -40,7 +40,7 @@ odoo.define("report_csv.report", function(require) {
|
|||||||
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();
|
||||||
},
|
},
|
||||||
@@ -53,7 +53,7 @@ odoo.define("report_csv.report", function(require) {
|
|||||||
var message = _t(
|
var message = _t(
|
||||||
"A popup window with your report was blocked. You " +
|
"A popup window with your report was blocked. You " +
|
||||||
"may need to change your browser settings to allow " +
|
"may need to change your browser settings to allow " +
|
||||||
"popup windows for this page."
|
"popup windows for this page.",
|
||||||
);
|
);
|
||||||
this.do_warn(_t("Warning"), message, true);
|
this.do_warn(_t("Warning"), message, true);
|
||||||
}
|
}
|
||||||
@@ -70,11 +70,11 @@ odoo.define("report_csv.report", function(require) {
|
|||||||
var closeAction = {type: "ir.actions.act_window_close"};
|
var closeAction = {type: "ir.actions.act_window_close"};
|
||||||
return self.doAction(
|
return self.doAction(
|
||||||
closeAction,
|
closeAction,
|
||||||
_.pick(options, "on_close")
|
_.pick(options, "on_close"),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return options.on_close();
|
return options.on_close();
|
||||||
}
|
},
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return this._super.apply(this, arguments);
|
return this._super.apply(this, arguments);
|
||||||
|
|||||||
Reference in New Issue
Block a user