Batch: fields

joomla · Nov 9, 2023 · d93f520 · d93f520
1 parent ea49f20
commit d93f520
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 37 deletions.
diff --git a/administrator/components/com_fields/src/View/Fields/HtmlView.php b/administrator/components/com_fields/src/View/Fields/HtmlView.php
@@ -175,7 +175,11 @@ protected function addToolbar()
             // Add a batch button
             if ($canDo->get('core.create') && $canDo->get('core.edit') && $canDo->get('core.edit.state')) {
                 $childBar->popupButton('batch', 'JTOOLBAR_BATCH')
-                    ->selector('collapseModal')
+                    ->popupType('inline')
+                    ->textHeader(Text::_('COM_FIELDS_VIEW_FIELDS_BATCH_OPTIONS'))
+                    ->url('#joomla-dialog-batch')
+                    ->modalWidth('800px')
+                    ->modalHeight('fit-content')
                     ->listCheck(true);
             }
         }

diff --git a/administrator/components/com_fields/tmpl/fields/default.php b/administrator/components/com_fields/tmpl/fields/default.php
@@ -205,15 +205,7 @@
                         && $user->authorise('core.edit', $component)
                         && $user->authorise('core.edit.state', $component)
                     ) : ?>
-                        <?php echo HTMLHelper::_(
-                            'bootstrap.renderModal',
-                            'collapseModal',
-                            [
-                                    'title' => Text::_('COM_FIELDS_VIEW_FIELDS_BATCH_OPTIONS'),
-                                    'footer' => $this->loadTemplate('batch_footer')
-                                ],
-                            $this->loadTemplate('batch_body')
-                        ); ?>
+                        <template id="joomla-dialog-batch"><?php echo $this->loadTemplate('batch_body'); ?></template>
                     <?php endif; ?>
                 <?php endif; ?>
                 <input type="hidden" name="task" value="">

diff --git a/administrator/components/com_fields/tmpl/fields/default_batch_body.php b/administrator/components/com_fields/tmpl/fields/default_batch_body.php
@@ -64,3 +64,8 @@
         </div>
     </div>
 </div>
+<div class="btn-toolbar p-3">
+    <joomla-toolbar-button task="field.batch" class="ms-auto">
+        <button type="button" class="btn btn-success"><?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?></button>
+    </joomla-toolbar-button>
+</div>
diff --git a/administrator/components/com_fields/tmpl/fields/default_batch_footer.php b/administrator/components/com_fields/tmpl/fields/default_batch_footer.php
diff --git a/build/media_source/com_fields/js/admin-fields-default-batch.es6.js b/build/media_source/com_fields/js/admin-fields-default-batch.es6.js
@@ -2,18 +2,22 @@
  * @copyright  (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
-document.addEventListener('DOMContentLoaded', () => {
-  'use strict';
+const setUp = (container) => {
+  const batchSelector = container.getElementById('batch-group-id');
+  const batchCopyMove = container.getElementById('batch-copy-move');
 
-  const batchSelector = document.getElementById('batch-group-id');
-  const batchCopyMove = document.getElementById('batch-copy-move');
-  batchCopyMove.classList.add('hidden');
+  if (!container || !batchCopyMove) {
+    return;
+  }
 
+  batchCopyMove.classList.add('hidden');
   batchSelector.addEventListener('change', () => {
     if (batchSelector.value === 'nogroup' || batchSelector.value !== '') {
       batchCopyMove.classList.remove('hidden');
     } else {
       batchCopyMove.classList.add('hidden');
     }
   }, false);
-});
+};
+document.addEventListener('DOMContentLoaded', () => setUp(document));
+document.addEventListener('joomla:loaded', ({ target }) => setUp(target));