From 2288e8f66f29db91cb530466c550d01ca37dffa8 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Mon, 18 Jan 2021 17:25:18 +0100
Subject: [PATCH] chg: [element:generic_index] Added more flexibility in topbar

---
 .../genericElements/ListTopBar/element_simple.php     | 11 +++++++----
 .../genericElements/ListTopBar/group_search.php       |  2 +-
 templates/genericTemplates/delete.php                 |  8 ++++++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/templates/element/genericElements/ListTopBar/element_simple.php b/templates/element/genericElements/ListTopBar/element_simple.php
index c0262b5..65ab6cc 100644
--- a/templates/element/genericElements/ListTopBar/element_simple.php
+++ b/templates/element/genericElements/ListTopBar/element_simple.php
@@ -2,8 +2,9 @@
     if (!isset($data['requirement']) || $data['requirement']) {
         if (!empty($data['popover_url'])) {
             $onClick = sprintf(
-                'onClick="openModalForButton(this, %s)"',
-                sprintf("'%s'", h($data['popover_url']))
+                'onClick="openModalForButton(this, \'%s\', \'%s\')"',
+                h($data['popover_url']),
+                h(!empty($data['reload_url']) ? $data['reload_url'] : '')
             );
         }
         if (empty($onClick)) {
@@ -69,10 +70,12 @@
 ?>
 
 <script>
-    function openModalForButton(clicked, url) {
+    function openModalForButton(clicked, url, reloadUrl='') {
         const loadingOverlay = new OverlayFactory(clicked);
+        const fallbackReloadUrl = '<?= $this->Url->build(['action' => 'index']); ?>'
+        reloadUrl = reloadUrl != '' ? reloadUrl : fallbackReloadUrl
         loadingOverlay.show()
-        UI.openModalFromURL(url, '<?= $this->Url->build(['action' => 'index']); ?>', '<?= $tableRandomValue ?>').finally(() => {
+        UI.openModalFromURL(url, reloadUrl, '<?= $tableRandomValue ?>').finally(() => {
             loadingOverlay.hide()
         })
     }
diff --git a/templates/element/genericElements/ListTopBar/group_search.php b/templates/element/genericElements/ListTopBar/group_search.php
index 6347fa8..5a47ce2 100644
--- a/templates/element/genericElements/ListTopBar/group_search.php
+++ b/templates/element/genericElements/ListTopBar/group_search.php
@@ -44,7 +44,7 @@
         var controller = '<?= $this->request->getParam('controller') ?>';
         var action = '<?= $this->request->getParam('action') ?>';
         var additionalUrlParams = '';
-        var quickFilter = <?= json_encode($quickFilter) ?>;
+        var quickFilter = <?= json_encode(!empty($quickFilter) ? $quickFilter : []) ?>;
         <?php
             if (!empty($data['additionalUrlParams'])) {
                 echo sprintf(
diff --git a/templates/genericTemplates/delete.php b/templates/genericTemplates/delete.php
index 7da1377..7da0be7 100644
--- a/templates/genericTemplates/delete.php
+++ b/templates/genericTemplates/delete.php
@@ -7,12 +7,16 @@
             </button>
         </div>
         <div class="modal-body">
-            <p><?= __('Are you sure you want to delete {0} #{1}?', h(Cake\Utility\Inflector::singularize($this->request->getParam('controller'))), h($id)) ?></p>
+            <?php if (empty($deletionText)): ?>
+                <p><?= __('Are you sure you want to delete {0} #{1}?', h(Cake\Utility\Inflector::singularize($this->request->getParam('controller'))), h($id)) ?></p>
+            <?php else: ?>
+                <p><?= h($deletionText) ?></p>
+            <?php endif; ?>
         </div>
         <div class="modal-footer">
             <?= $this->Form->postLink(
                 'Delete',
-                ['action' => 'delete', $id],
+                (empty($postLinkParameters) ? ['action' => 'delete', $id] : $postLinkParameters),
                 ['class' => 'btn btn-primary button-execute', 'id' => 'submitButton']
                 )
             ?>