From b320f7517fdba1183da1fc1dc5b980a69abf6169 Mon Sep 17 00:00:00 2001
From: nathan <nathangray.bsc+github@gmail.com>
Date: Mon, 18 Oct 2021 09:42:12 -0600
Subject: [PATCH] Fix kanban merge into document stopped working with
 introduction of PDF checkbox

---
 api/js/jsapi/egw_app.js | 10 ++++++----
 api/js/jsapi/egw_app.ts | 10 +++++++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/api/js/jsapi/egw_app.js b/api/js/jsapi/egw_app.js
index 7b50a21e6d..8814c0227c 100644
--- a/api/js/jsapi/egw_app.js
+++ b/api/js/jsapi/egw_app.js
@@ -580,20 +580,22 @@ var EgwApp = /** @class */ (function () {
      * @param {egwActionObject[]} _selected
      */
     EgwApp.prototype.merge = function (_action, _selected) {
-        var _a;
         // Find what we need
         var nm = null;
         var action = _action;
-        var as_pdf = false;
+        var as_pdf = null;
         // Find Select all
-        while (nm == null && action != null) {
+        while (nm == null && action.parent != null) {
             if (action.data != null && 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;
         }
         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
         var ids = [];
         for (var i = 0; !all && i < _selected.length; i++) {
diff --git a/api/js/jsapi/egw_app.ts b/api/js/jsapi/egw_app.ts
index c5009a1c84..303b99bf68 100644
--- a/api/js/jsapi/egw_app.ts
+++ b/api/js/jsapi/egw_app.ts
@@ -745,20 +745,24 @@ export abstract class EgwApp
 		// Find what we need
 		let nm = null;
 		let action = _action;
-		let as_pdf = false;
+		let as_pdf = null;
 
 		// Find Select all
-		while(nm == null && action != null)
+		while(nm == null && action.parent != null)
 		{
 			if(action.data != null && 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;
 		}
 		let all = nm?.getSelection().all || false;
 
-		as_pdf = action.getActionById('as_pdf')?.checked || false;
+		as_pdf = as_pdf || false;
 
 		// Get list of entry IDs
 		let ids = [];