Merge pull request #10440 from MrPetovan/bug/10439-addon-settings-forms
Wrap each addon settings form in their own form tag
This commit is contained in:
commit
a44a9e73c3
|
@ -502,21 +502,20 @@ function settings_content(App $a)
|
|||
}
|
||||
|
||||
if (($a->argc > 1) && ($a->argv[1] === 'addon')) {
|
||||
$settings_addons = "";
|
||||
$addon_settings_forms = [];
|
||||
|
||||
$r = q("SELECT * FROM `hook` WHERE `hook` = 'addon_settings' ");
|
||||
if (!DBA::isResult($r)) {
|
||||
$settings_addons = DI::l10n()->t('No Addon settings configured');
|
||||
foreach (DI::dba()->select('hook', ['file', 'function'], ['hook' => 'addon_settings']) as $hook) {
|
||||
$data = '';
|
||||
Hook::callSingle(DI::app(), 'addon_settings', [$hook['file'], $hook['function']], $data);
|
||||
$addon_settings_forms[] = $data;
|
||||
}
|
||||
|
||||
Hook::callAll('addon_settings', $settings_addons);
|
||||
|
||||
|
||||
$tpl = Renderer::getMarkupTemplate('settings/addons.tpl');
|
||||
$o .= Renderer::replaceMacros($tpl, [
|
||||
'$form_security_token' => BaseModule::getFormSecurityToken("settings_addon"),
|
||||
'$title' => DI::l10n()->t('Addon Settings'),
|
||||
'$settings_addons' => $settings_addons
|
||||
'$no_addons_settings_configured' => DI::l10n()->t('No Addon settings configured'),
|
||||
'$addon_settings_forms' => $addon_settings_forms,
|
||||
]);
|
||||
return $o;
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,11 +1,14 @@
|
|||
|
||||
<h1>{{$title}}</h1>
|
||||
|
||||
{{foreach $addon_settings_forms as $addon_settings_form}}
|
||||
|
||||
<form action="settings/addon" method="post" autocomplete="off">
|
||||
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
|
||||
|
||||
{{$settings_addons nofilter}}
|
||||
|
||||
<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
|
||||
{{$addon_settings_form nofilter}}
|
||||
</form>
|
||||
|
||||
{{foreachelse}}
|
||||
|
||||
<p>{{$no_addon_settings_configured}}</p>
|
||||
|
||||
{{/foreach}}
|
||||
|
|
|
@ -2,11 +2,17 @@
|
|||
{{* include the title template for the settings title *}}
|
||||
{{include file="section_title.tpl" title=$title}}
|
||||
|
||||
{{foreach $addon_settings_forms as $addon_settings_form}}
|
||||
|
||||
<form action="settings/addon" method="post" autocomplete="off">
|
||||
<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
|
||||
|
||||
{{$settings_addons nofilter}}
|
||||
|
||||
<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
|
||||
{{$addon_settings_form nofilter}}
|
||||
</form>
|
||||
|
||||
{{foreachelse}}
|
||||
|
||||
<div class="alert alert-info" role="alert">{{$no_addon_settings_configured}}</div>
|
||||
|
||||
{{/foreach}}
|
||||
|
||||
</div>
|
Loading…
Reference in a new issue