extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-17 19:01:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix kanban merge into document stopped working with introduction of PDF checkbox

Browse Source
This commit is contained in:
nathan 2021-10-18 09:42:12 -06:00 committed by Ralf Becker
parent d9959a6aa0
commit b320f7517f
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/js/jsapi/egw_app.js
View File

@ -580,20 +580,22 @@ var EgwApp = /** @class */ (function () {
* @param {egwActionObject[]} _selected * @param {egwActionObject[]} _selected
*/ */
EgwApp.prototype.merge = function (_action, _selected) { EgwApp.prototype.merge = function (_action, _selected) {
var _a;
// Find what we need // Find what we need
var nm = null; var nm = null;
var action = _action; var action = _action;
var as_pdf = false; var as_pdf = null;
// Find Select all // Find Select all
while (nm == null && action != null) { while (nm == null && action.parent != null) {
if (action.data != null && action.data.nextmatch) { if (action.data != null && action.data.nextmatch) {
nm = action.data.nextmatch; nm = action.data.nextmatch;
} }
if (as_pdf === null && action.getActionById('as_pdf') !== null) {
as_pdf = action.getActionById('as_pdf').checked;
}
action = action.parent; action = action.parent;
} }
var all = (nm === null || nm === void 0 ? void 0 : nm.getSelection().all) || false; var all = (nm === null || nm === void 0 ? void 0 : nm.getSelection().all) || false;
as_pdf = ((_a = action.getActionById('as_pdf')) === null || _a === void 0 ? void 0 : _a.checked) || false; as_pdf = as_pdf || false;
// Get list of entry IDs // Get list of entry IDs
var ids = []; var ids = [];
for (var i = 0; !all && i < _selected.length; i++) { for (var i = 0; !all && i < _selected.length; i++) {

10
api/js/jsapi/egw_app.ts
View File

@ -745,20 +745,24 @@ export abstract class EgwApp
// Find what we need // Find what we need
let nm = null; let nm = null;
let action = _action; let action = _action;
let as_pdf = false; let as_pdf = null;
// Find Select all // Find Select all
while(nm == null && action != null) while(nm == null && action.parent != null)
{ {
if(action.data != null && action.data.nextmatch) if(action.data != null && action.data.nextmatch)
{ {
nm = action.data.nextmatch; nm = action.data.nextmatch;
} }
if(as_pdf === null && action.getActionById('as_pdf') !== null)
{
as_pdf = action.getActionById('as_pdf').checked;
}
action = action.parent; action = action.parent;
} }
let all = nm?.getSelection().all || false; let all = nm?.getSelection().all || false;
as_pdf = action.getActionById('as_pdf')?.checked || false; as_pdf = as_pdf || false;
// Get list of entry IDs // Get list of entry IDs
let ids = []; let ids = [];