Skip to content

[6.0] Update layouts to use Form control fields #45694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
softforge merged 37 commits into from
Aug 6, 2025
Merged

[6.0] Update layouts to use Form control fields #45694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
0a6d264
form controls: actionlogs
Fedik Jul 6, 2025
2ece39a
form controls: lang assoc
Fedik Jul 6, 2025
0a653b0
form controls: banners
Fedik Jul 6, 2025
e840734
form controls: cache
Fedik Jul 6, 2025
fc34d7b
form controls: checkin
Fedik Jul 6, 2025
1984270
form controls: config
Fedik Jul 6, 2025
643c9bd
form controls: contact
Fedik Jul 6, 2025
b412e6d
form controls: fields
Fedik Jul 6, 2025
1bb1bbf
form controls: finder
Fedik Jul 6, 2025
0ead520
form controls: tours
Fedik Jul 6, 2025
677d441
form controls: fix
Fedik Jul 6, 2025
671475f
form controls: installer
Fedik Jul 6, 2025
2808552
form controls: languages
Fedik Jul 6, 2025
8c60523
form controls: mails
Fedik Jul 6, 2025
e0568d3
form controls: messages
Fedik Jul 6, 2025
355bb49
form controls: modules
Fedik Jul 6, 2025
1d49b0d
form controls: newsfeed
Fedik Jul 6, 2025
029939b
form controls: plugins
Fedik Jul 6, 2025
e6d75e4
form controls: privacy
Fedik Jul 6, 2025
0b51c11
form controls: redirect
Fedik Jul 6, 2025
48a06ac
form controls: scheduler
Fedik Jul 6, 2025
38b548a
form controls: tags
Fedik Jul 6, 2025
4098775
form controls: templates
Fedik Jul 6, 2025
97df902
form controls: users
Fedik Jul 6, 2025
2910eea
form controls: workflows
Fedik Jul 6, 2025
771baca
form controls site: config
Fedik Jul 6, 2025
f0aa804
form controls site: contact
Fedik Jul 6, 2025
a10c365
form controls site: privacy
Fedik Jul 6, 2025
09ea679
form controls site: users
Fedik Jul 6, 2025
59e0991
form controls: emptystate
Fedik Jul 6, 2025
6879ec3
cs
Fedik Jul 6, 2025
5d8f270
Update administrator/components/com_associations/src/View/Association…
Fedik Jul 6, 2025
6092747
cs
Fedik Jul 7, 2025
a0135b7
Merge branch '6.0-dev' into form-control-fields-com1
QuyTon Jul 11, 2025
f2a4238
Merge branch '6.0-dev' into form-control-fields-com1
richard67 Jul 16, 2025
b52026f
phpstan
Fedik Jul 18, 2025
3232e47
Merge branch '6.0-dev' into form-control-fields-com1
softforge Aug 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions administrator/components/com_actionlogs/src/View/Actionlogs/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,11 @@ public function display($tpl = null)
// Load all actionlog plugins language files
ActionlogsHelper::loadActionLogPluginsLanguage();

// Add form control fields
$this->filterForm
->addControlField('task', '')
->addControlField('boxchecked', '0');

parent::display($tpl);
}

Expand Down
5 changes: 2 additions & 3 deletions administrator/components/com_actionlogs/tmpl/actionlogs/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,8 @@
<?php echo $this->pagination->getListFooter(); ?>

<?php endif;?>
<input type="hidden" name="task" value="" />
<input type="hidden" name="boxchecked" value="0" />
<?php echo HTMLHelper::_('form.token'); ?>

<?php echo $this->filterForm->renderControlFields(); ?>
</div>
</form>
<form action="<?php echo Route::_('index.php?option=com_actionlogs&view=actionlogs'); ?>" method="post" name="exportForm" id="exportForm">
Expand Down
5 changes: 5 additions & 0 deletions administrator/components/com_associations/src/View/Association/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,11 @@ public function display($tpl = null): void

$this->addToolbar();

// Add form control fields
$this->form
->addControlField('task', '')
->addControlField('target-id', '', ['id' => 'target-id']);

parent::display($tpl);
}

Expand Down
9 changes: 9 additions & 0 deletions administrator/components/com_associations/src/View/Associations/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,10 @@ public function display($tpl = null)
$this->filterForm = $model->getFilterForm();
$this->activeFilters = $model->getActiveFilters();

// Add form control fields
$this->filterForm
->addControlField('task', '');

if (!Associations::isEnabled()) {
$link = Route::_('index.php?option=com_plugins&task=plugin.edit&extension_id=' . AssociationsHelper::getLanguagefilterPluginId());
Factory::getApplication()->enqueueMessage(Text::sprintf('COM_ASSOCIATIONS_ERROR_NO_ASSOC', $link), 'warning');
Expand Down Expand Up @@ -211,6 +215,11 @@ public function display($tpl = null)
if ($forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'CMD')) {
$this->filterForm->setFieldAttribute('category_id', 'language', '*,' . $forcedLanguage, 'filter');
}

// Add extra form control fields for modal
$this->filterForm
->addControlField('forcedItemType', Factory::getApplication()->getInput()->get('forcedItemType', '', 'string'))
->addControlField('forcedLanguage', $forcedLanguage);
}
}

Expand Down
5 changes: 1 addition & 4 deletions administrator/components/com_associations/tmpl/association/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

defined('_JEXEC') or die;

use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Router\Route;
use Joomla\Component\Associations\Administrator\View\Association\HtmlView;
Expand Down Expand Up @@ -83,7 +82,5 @@
</div>
</div>

<input type="hidden" name="task" value="">
<input type="hidden" name="target-id" id="target-id" value="">
<?php echo HTMLHelper::_('form.token'); ?>
<?php echo $this->form->renderControlFields(); ?>
</form>
4 changes: 2 additions & 2 deletions administrator/components/com_associations/tmpl/associations/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@
<?php echo $this->pagination->getListFooter(); ?>

<?php endif; ?>
<input type="hidden" name="task" value="">
<?php echo HTMLHelper::_('form.token'); ?>

<?php echo $this->filterForm->renderControlFields(); ?>
</div>
</div>
</div>
Expand Down
5 changes: 1 addition & 4 deletions administrator/components/com_associations/tmpl/associations/modal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,6 @@

<?php endif; ?>

<input type="hidden" name="task" value="">
<input type="hidden" name="forcedItemType" value="<?php echo $app->getInput()->get('forcedItemType', '', 'string'); ?>">
<input type="hidden" name="forcedLanguage" value="<?php echo $app->getInput()->get('forcedLanguage', '', 'cmd'); ?>">
<?php echo HTMLHelper::_('form.token'); ?>
<?php echo $this->filterForm->renderControlFields(); ?>
</form>
</div>
4 changes: 4 additions & 0 deletions administrator/components/com_banners/src/View/Banner/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ public function display($tpl = null): void

$this->addToolbar();

// Add form control fields
$this->form
->addControlField('task', '');

parent::display($tpl);
}

Expand Down
5 changes: 5 additions & 0 deletions administrator/components/com_banners/src/View/Banners/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,11 @@ public function display($tpl = null): void
$this->filterForm->removeField('language', 'filter');
}

// Add form control fields
$this->filterForm
->addControlField('task', '')
->addControlField('boxchecked', '0');

parent::display($tpl);
}

Expand Down
4 changes: 4 additions & 0 deletions administrator/components/com_banners/src/View/Client/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ public function display($tpl = null): void

$this->addToolbar();

// Add form control fields
$this->form
->addControlField('task', '');

parent::display($tpl);
}

Expand Down
5 changes: 5 additions & 0 deletions administrator/components/com_banners/src/View/Clients/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,11 @@ public function display($tpl = null): void

$this->addToolbar();

// Add form control fields
$this->filterForm
->addControlField('task', '')
->addControlField('boxchecked', '0');

parent::display($tpl);
}

Expand Down
5 changes: 5 additions & 0 deletions administrator/components/com_banners/src/View/Tracks/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,11 @@ public function display($tpl = null): void

$this->addToolbar();

// Add form control fields
$this->filterForm
->addControlField('task', '')
->addControlField('boxchecked', '0');

parent::display($tpl);
}

Expand Down
3 changes: 1 addition & 2 deletions administrator/components/com_banners/tmpl/banner/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,5 @@
<?php echo HTMLHelper::_('uitab.endTabSet'); ?>
</div>

<input type="hidden" name="task" value="">
<?php echo HTMLHelper::_('form.token'); ?>
<?php echo $this->form->renderControlFields(); ?>
</form>
4 changes: 1 addition & 3 deletions administrator/components/com_banners/tmpl/banners/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,7 @@
<?php endif; ?>
<?php endif; ?>

<input type="hidden" name="task" value="">
<input type="hidden" name="boxchecked" value="0">
<?php echo HTMLHelper::_('form.token'); ?>
<?php echo $this->filterForm->renderControlFields(); ?>
</div>
</div>
</div>
Expand Down
2 changes: 2 additions & 0 deletions administrator/components/com_banners/tmpl/banners/emptystate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
'formURL' => 'index.php?option=com_banners&view=banners',
'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Banners',
'icon' => 'icon-bookmark banners',

'controlFields' => $this->filterForm->renderControlFields(),
];

$user = $this->getCurrentUser();
Expand Down
3 changes: 1 addition & 2 deletions administrator/components/com_banners/tmpl/client/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,5 @@
<?php echo HTMLHelper::_('uitab.endTabSet'); ?>
</div>

<input type="hidden" name="task" value="">
<?php echo HTMLHelper::_('form.token'); ?>
<?php echo $this->form->renderControlFields(); ?>
</form>
4 changes: 1 addition & 3 deletions administrator/components/com_banners/tmpl/clients/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,7 @@

<?php endif; ?>

<input type="hidden" name="task" value="">
<input type="hidden" name="boxchecked" value="0">
<?php echo HTMLHelper::_('form.token'); ?>
<?php echo $this->filterForm->renderControlFields(); ?>
</div>
</div>
</div>
Expand Down
2 changes: 2 additions & 0 deletions administrator/components/com_banners/tmpl/clients/emptystate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
'formURL' => 'index.php?option=com_banners&view=clients',
'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Banners:_Clients',
'icon' => 'icon-bookmark banners',

'controlFields' => $this->filterForm->renderControlFields(),
];

if (count($this->getCurrentUser()->getAuthorisedCategories('com_banners', 'core.create')) > 0) {
Expand Down
5 changes: 2 additions & 3 deletions administrator/components/com_banners/tmpl/tracks/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,8 @@
<?php echo $this->pagination->getListFooter(); ?>

<?php endif; ?>
<input type="hidden" name="task" value="">
<input type="hidden" name="boxchecked" value="0">
<?php echo HTMLHelper::_('form.token'); ?>

<?php echo $this->filterForm->renderControlFields(); ?>
</div>
</div>
</div>
Expand Down
2 changes: 2 additions & 0 deletions administrator/components/com_banners/tmpl/tracks/emptystate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
'textPrefix' => 'COM_BANNERS_TRACKS',
'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Banners:_Tracks',
'icon' => 'icon-bookmark banners',

'controlFields' => $this->filterForm->renderControlFields(),
];

echo LayoutHelper::render('joomla.content.emptystate', $displayData);
5 changes: 5 additions & 0 deletions administrator/components/com_cache/src/View/Cache/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,11 @@ public function display($tpl = null): void

$this->addToolbar();

// Add form control fields
$this->filterForm
->addControlField('task', '')
->addControlField('boxchecked', '0');

parent::display($tpl);
}

Expand Down
5 changes: 2 additions & 3 deletions administrator/components/com_cache/tmpl/cache/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,8 @@
<?php echo $this->pagination->getListFooter(); ?>

<?php endif; ?>
<input type="hidden" name="task" value="">
<input type="hidden" name="boxchecked" value="0">
<?php echo HTMLHelper::_('form.token'); ?>

<?php echo $this->filterForm->renderControlFields(); ?>
</div>
</div>
</div>
Expand Down
2 changes: 2 additions & 0 deletions administrator/components/com_cache/tmpl/cache/emptystate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
'textPrefix' => 'COM_CACHE',
'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Cache',
'icon' => 'icon-bolt clear',

'controlFields' => $this->filterForm->renderControlFields(),
];

echo LayoutHelper::render('joomla.content.emptystate', $displayData);
2 changes: 2 additions & 0 deletions administrator/components/com_categories/tmpl/categories/emptystate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Category',
'title' => $title,
'icon' => 'icon-folder categories content-categories',

'controlFields' => $this->filterForm->renderControlFields(),
];

if ($this->getCurrentUser()->authorise('core.create', $extension)) {
Expand Down
5 changes: 5 additions & 0 deletions administrator/components/com_checkin/src/View/Checkin/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,11 @@ public function display($tpl = null)

$this->addToolbar();

// Add form control fields
$this->filterForm
->addControlField('task', '')
->addControlField('boxchecked', '0');

parent::display($tpl);
}

Expand Down
5 changes: 2 additions & 3 deletions administrator/components/com_checkin/tmpl/checkin/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,8 @@
<?php echo $this->pagination->getListFooter(); ?>

<?php endif; ?>
<input type="hidden" name="task" value="">
<input type="hidden" name="boxchecked" value="0">
<?php echo HTMLHelper::_('form.token'); ?>

<?php echo $this->filterForm->renderControlFields(); ?>
</div>
</div>
</div>
Expand Down
2 changes: 2 additions & 0 deletions administrator/components/com_checkin/tmpl/checkin/emptystate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Maintenance:_Global_Check-in',
'icon' => 'icon-check-square',
'title' => Text::_('COM_CHECKIN_GLOBAL_CHECK_IN'),

'controlFields' => $this->filterForm->renderControlFields(),
];

echo LayoutHelper::render('joomla.content.emptystate', $displayData);
4 changes: 4 additions & 0 deletions administrator/components/com_config/src/View/Application/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,10 @@ public function display($tpl = null)

$this->addToolbar();

// Add form control fields
$this->form
->addControlField('task', '');

parent::display($tpl);
}

Expand Down
7 changes: 7 additions & 0 deletions administrator/components/com_config/src/View/Component/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,13 @@ public function display($tpl = null)

$this->addToolbar();

// Add form control fields
$this->form
->addControlField('task', '')
->addControlField('id', $this->component->id)
->addControlField('component', $this->component->option)
->addControlField('return', $this->return);

parent::display($tpl);
}

Expand Down
3 changes: 1 addition & 2 deletions administrator/components/com_config/tmpl/application/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,7 @@
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php echo HTMLHelper::_('uitab.endTabSet'); ?>

<input type="hidden" name="task" value="">
<?php echo HTMLHelper::_('form.token'); ?>
<?php echo $this->form->renderControlFields(); ?>
</div>
</div>
</form>
6 changes: 1 addition & 5 deletions administrator/components/com_config/tmpl/component/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,6 @@
<?php endif; ?>
</div>

<input type="hidden" name="id" value="<?php echo $this->component->id; ?>">
<input type="hidden" name="component" value="<?php echo $this->component->option; ?>">
<input type="hidden" name="return" value="<?php echo $this->return; ?>">
<input type="hidden" name="task" value="">
<?php echo HTMLHelper::_('form.token'); ?>
<?php echo $this->form->renderControlFields(); ?>
</div>
</form>
9 changes: 8 additions & 1 deletion administrator/components/com_contact/src/View/Contact/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@ public function display($tpl = null)
}

// If we are forcing a language in modal (used for associations).
if ($this->getLayout() === 'modal' && $forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'cmd')) {
$forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'cmd');

if ($this->getLayout() === 'modal' && $forcedLanguage) {
// Set the language field to the forcedLanguage and disable changing it.
$this->form->setValue('language', null, $forcedLanguage);
$this->form->setFieldAttribute('language', 'readonly', 'true');
Expand All @@ -109,6 +111,11 @@ public function display($tpl = null)
$this->addModalToolbar();
}

// Add form control fields
$this->form
->addControlField('task', '')
->addControlField('forcedLanguage', $forcedLanguage);

parent::display($tpl);
}

Expand Down
Loading
Loading