[6.0] ListView improvements (joomla#46165)

Author: joomdonation

administrator/components/com_actionlogs/src/View/Actionlogs/HtmlView.php

@@ -79,11 +79,6 @@ protected function initializeView()
 
         // Load all actionlog plugins language files
         ActionlogsHelper::loadActionLogPluginsLanguage();
-
-        // Add form control fields
-        $this->filterForm
-            ->addControlField('task', '')
-            ->addControlField('boxchecked', '0');
     }
 
     /**

administrator/components/com_banners/src/View/Banners/HtmlView.php

@@ -83,10 +83,5 @@ protected function initializeView()
             unset($this->activeFilters['language']);
             $this->filterForm->removeField('language', 'filter');
         }
-
-        // Add form control fields
-        $this->filterForm
-            ->addControlField('task', '')
-            ->addControlField('boxchecked', '0');
     }
 }

administrator/components/com_banners/tmpl/banners/default.php

@@ -177,11 +177,7 @@
 
                     <?php // Load the batch processing form. ?>
                     <?php
-                    if (
-                        $user->authorise('core.create', 'com_banners')
-                        && $user->authorise('core.edit', 'com_banners')
-                        && $user->authorise('core.edit.state', 'com_banners')
-                    ) : ?>
+                    if ($this->batchAllowed) : ?>
                         <template id="joomla-dialog-batch"><?php echo $this->loadTemplate('batch_body'); ?></template>
                     <?php endif; ?>
                 <?php endif; ?>

administrator/components/com_contact/src/View/Contacts/HtmlView.php

@@ -95,10 +95,5 @@ protected function initializeView()
             $this->filterForm
                 ->addControlField('forcedLanguage', $forcedLanguage);
         }
-
-        // Add form control fields
-        $this->filterForm
-            ->addControlField('task', '')
-            ->addControlField('boxchecked', '0');
     }
 }

administrator/components/com_contact/tmpl/contacts/default.php

@@ -187,11 +187,7 @@
 
                     <?php // Load the batch processing form. ?>
                     <?php
-                    if (
-                        $user->authorise('core.create', 'com_contact')
-                        && $user->authorise('core.edit', 'com_contact')
-                        && $user->authorise('core.edit.state', 'com_contact')
-                    ) : ?>
+                    if ($this->batchAllowed) : ?>
                         <template id="joomla-dialog-batch"><?php echo $this->loadTemplate('batch_body'); ?></template>
                     <?php endif; ?>
                 <?php endif; ?>

administrator/components/com_modules/src/View/Modules/HtmlView.php

@@ -130,11 +130,6 @@ protected function initializeView()
                 unset($this->activeFilters['state'], $this->activeFilters['language']);
             }
         }
-
-        // Add form control fields
-        $this->filterForm
-            ->addControlField('task', '')
-            ->addControlField('boxchecked', '0');
     }
 
     /**
@@ -147,7 +142,6 @@ protected function initializeView()
     protected function addToolbar()
     {
         $canDo = $this->canDo;
-        $user  = $this->getCurrentUser();
 
         $canCreate = $canDo->get('core.create');
 

administrator/components/com_modules/tmpl/modules/default.php

@@ -200,11 +200,7 @@
 
         <?php // Load the batch processing form. ?>
         <?php
-        if (
-            $user->authorise('core.create', 'com_modules')
-            && $user->authorise('core.edit', 'com_modules')
-            && $user->authorise('core.edit.state', 'com_modules')
-        ) : ?>
+        if ($this->batchAllowed) : ?>
             <template id="joomla-dialog-batch"><?php echo $this->loadTemplate('batch_body'); ?></template>
         <?php endif; ?>
 

libraries/src/MVC/View/ListView.php

@@ -105,6 +105,14 @@ class ListView extends HtmlView
      */
     protected $supportsBatch = true;
 
+    /**
+     * The flag which determine if the current user is allowed to perform batch actions. It is
+     * used in layout to determine if we need to render batch layout
+     *
+     * @var boolean
+     */
+    protected $batchAllowed = false;
+
     /**
      * Holds the extension for categories, if available
      *
@@ -227,6 +235,11 @@ protected function initializeView()
         $this->state         = $model->getState();
         $this->filterForm    = $model->getFilterForm();
         $this->activeFilters = $model->getActiveFilters();
+
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task', '')
+            ->addControlField('boxchecked', '0');
     }
 
     /**
@@ -242,7 +255,7 @@ protected function addToolbar()
         $user  = $this->getCurrentUser();
 
         /**
-         * @var Toolbar $toolbar
+         * @var \Joomla\CMS\Toolbar\Toolbar $toolbar
          */
         $toolbar = $this->getDocument()->getToolbar();
 
@@ -257,7 +270,7 @@ protected function addToolbar()
         }
 
         if (!$this->isEmptyState && $canDo->get('core.edit.state')) {
-            /** @var  DropdownButton $dropdown */
+            /** @var  \Joomla\CMS\Toolbar\Button\DropdownButton $dropdown */
             $dropdown = $toolbar->dropdownButton('status-group', 'JTOOLBAR_CHANGE_STATUS')
                 ->toggleSplit(false)
                 ->icon('icon-ellipsis-h')
@@ -299,6 +312,8 @@ protected function addToolbar()
                     ->modalWidth('800px')
                     ->modalHeight('fit-content')
                     ->listCheck(true);
+
+                $this->batchAllowed = true;
             }
         }