Merge branch 'develop'

pull/163/head v1.14
iglocska 2023-05-31 09:42:39 +02:00
commit 47a8f4f57e
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
4 changed files with 10 additions and 6 deletions

View File

@ -89,8 +89,10 @@ echo $this->Bootstrap->modal([
'<div class="form-container">%s</div>', '<div class="form-container">%s</div>',
$combinedForm $combinedForm
), ),
'confirmText' => __('Create user'), 'confirmButton' => [
'confirmFunction' => 'submitRegistration' 'text' => __('Create user'),
'onclick' => 'submitRegistration',
],
]); ]);
?> ?>
</div> </div>

View File

@ -1,4 +1,4 @@
{ {
"version": "1.13", "version": "1.14",
"application": "Cerebrate" "application": "Cerebrate"
} }

View File

@ -132,8 +132,10 @@ echo $this->Bootstrap->modal([
'bodyHtml' => $bodyHtml, 'bodyHtml' => $bodyHtml,
'size' => $modalSize, 'size' => $modalSize,
'type' => $modalType, 'type' => $modalType,
'confirmText' => __('Update meta-templates'), 'confirmButton' => [
'confirmFunction' => 'updateMetaTemplate', 'text' => __('Update meta-templates'),
'onclick' => 'updateMetaTemplate',
],
]); ]);
?> ?>

View File

@ -36,4 +36,4 @@ $modalOptions = array_merge($defaultOptions, $modalOptions ?? []);
$modalOptions['bodyHtml'] = $bodyHTML; $modalOptions['bodyHtml'] = $bodyHTML;
echo $this->Bootstrap->modal($modalOptions); echo $this->Bootstrap->modal($modalOptions);
?>