Skip to content

Commit ddfe0d2

Browse files
FedikFedik
authored
[6.0] Update layouts to use Form control fields (#45694)
* form controls: actionlogs * form controls: lang assoc * form controls: banners * form controls: cache * form controls: checkin * form controls: config * form controls: contact * form controls: fields * form controls: finder * form controls: tours * form controls: fix * form controls: installer * form controls: languages * form controls: mails * form controls: messages * form controls: modules * form controls: newsfeed * form controls: plugins * form controls: privacy * form controls: redirect * form controls: scheduler * form controls: tags * form controls: templates * form controls: users * form controls: workflows * form controls site: config * form controls site: contact * form controls site: privacy * form controls site: users * form controls: emptystate * cs * Update administrator/components/com_associations/src/View/Associations/HtmlView.php
1 parent a36b5d2 commit ddfe0d2

File tree

209 files changed

+668
-324
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

209 files changed

+668
-324
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,11 @@ public function display($tpl = null)
120120
// Load all actionlog plugins language files
121121
ActionlogsHelper::loadActionLogPluginsLanguage();
122122

123+
// Add form control fields
124+
$this->filterForm
125+
->addControlField('task', '')
126+
->addControlField('boxchecked', '0');
127+
123128
parent::display($tpl);
124129
}
125130

‎administrator/components/com_actionlogs/tmpl/actionlogs/default.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,8 @@
118118
<?php echo $this->pagination->getListFooter(); ?>
119119

120120
<?php endif;?>
121-
<input type="hidden" name="task" value="" />
122-
<input type="hidden" name="boxchecked" value="0" />
123-
<?php echo HTMLHelper::_('form.token'); ?>
121+
122+
<?php echo $this->filterForm->renderControlFields(); ?>
124123
</div>
125124
</form>
126125
<form action="<?php echo Route::_('index.php?option=com_actionlogs&view=actionlogs'); ?>" method="post" name="exportForm" id="exportForm">

‎administrator/components/com_associations/src/View/Association/HtmlView.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,11 @@ public function display($tpl = null): void
322322

323323
$this->addToolbar();
324324

325+
// Add form control fields
326+
$this->form
327+
->addControlField('task', '')
328+
->addControlField('target-id', '', ['id' => 'target-id']);
329+
325330
parent::display($tpl);
326331
}
327332

‎administrator/components/com_associations/src/View/Associations/HtmlView.php‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ public function display($tpl = null)
134134
$this->filterForm = $model->getFilterForm();
135135
$this->activeFilters = $model->getActiveFilters();
136136

137+
// Add form control fields
138+
$this->filterForm
139+
->addControlField('task', '');
140+
137141
if (!Associations::isEnabled()) {
138142
$link = Route::_('index.php?option=com_plugins&task=plugin.edit&extension_id=' . AssociationsHelper::getLanguagefilterPluginId());
139143
Factory::getApplication()->enqueueMessage(Text::sprintf('COM_ASSOCIATIONS_ERROR_NO_ASSOC', $link), 'warning');
@@ -211,6 +215,11 @@ public function display($tpl = null)
211215
if ($forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'CMD')) {
212216
$this->filterForm->setFieldAttribute('category_id', 'language', '*,' . $forcedLanguage, 'filter');
213217
}
218+
219+
// Add extra form control fields for modal
220+
$this->filterForm
221+
->addControlField('forcedItemType', Factory::getApplication()->getInput()->get('forcedItemType', '', 'string'))
222+
->addControlField('forcedLanguage', $forcedLanguage);
214223
}
215224
}
216225

‎administrator/components/com_associations/tmpl/association/edit.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
defined('_JEXEC') or die;
1212

13-
use Joomla\CMS\HTML\HTMLHelper;
1413
use Joomla\CMS\Language\Text;
1514
use Joomla\CMS\Router\Route;
1615
use Joomla\Component\Associations\Administrator\View\Association\HtmlView;
@@ -83,7 +82,5 @@
8382
</div>
8483
</div>
8584

86-
<input type="hidden" name="task" value="">
87-
<input type="hidden" name="target-id" id="target-id" value="">
88-
<?php echo HTMLHelper::_('form.token'); ?>
85+
<?php echo $this->form->renderControlFields(); ?>
8986
</form>

‎administrator/components/com_associations/tmpl/associations/default.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@
164164
<?php echo $this->pagination->getListFooter(); ?>
165165

166166
<?php endif; ?>
167-
<input type="hidden" name="task" value="">
168-
<?php echo HTMLHelper::_('form.token'); ?>
167+
168+
<?php echo $this->filterForm->renderControlFields(); ?>
169169
</div>
170170
</div>
171171
</div>

‎administrator/components/com_associations/tmpl/associations/modal.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,6 @@
164164

165165
<?php endif; ?>
166166

167-
<input type="hidden" name="task" value="">
168-
<input type="hidden" name="forcedItemType" value="<?php echo $app->getInput()->get('forcedItemType', '', 'string'); ?>">
169-
<input type="hidden" name="forcedLanguage" value="<?php echo $app->getInput()->get('forcedLanguage', '', 'cmd'); ?>">
170-
<?php echo HTMLHelper::_('form.token'); ?>
167+
<?php echo $this->filterForm->renderControlFields(); ?>
171168
</form>
172169
</div>

‎administrator/components/com_banners/src/View/Banner/HtmlView.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@ public function display($tpl = null): void
8282

8383
$this->addToolbar();
8484

85+
// Add form control fields
86+
$this->form
87+
->addControlField('task', '');
88+
8589
parent::display($tpl);
8690
}
8791

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,11 @@ public function display($tpl = null): void
127127
$this->filterForm->removeField('language', 'filter');
128128
}
129129

130+
// Add form control fields
131+
$this->filterForm
132+
->addControlField('task', '')
133+
->addControlField('boxchecked', '0');
134+
130135
parent::display($tpl);
131136
}
132137

‎administrator/components/com_banners/src/View/Client/HtmlView.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,10 @@ public function display($tpl = null): void
9191

9292
$this->addToolbar();
9393

94+
// Add form control fields
95+
$this->form
96+
->addControlField('task', '');
97+
9498
parent::display($tpl);
9599
}
96100

0 commit comments

Comments
 (0)