From de101715807253e6cac493600934274e871943c5 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Thu, 26 Nov 2015 15:52:45 +0100 Subject: [PATCH] Show theming options in the application configuration refs #10705 --- application/forms/Config/GeneralConfigForm.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/application/forms/Config/GeneralConfigForm.php b/application/forms/Config/GeneralConfigForm.php index 5b00d06f49..5df09a140c 100644 --- a/application/forms/Config/GeneralConfigForm.php +++ b/application/forms/Config/GeneralConfigForm.php @@ -5,15 +5,16 @@ use Icinga\Forms\Config\General\ApplicationConfigForm; use Icinga\Forms\Config\General\LoggingConfigForm; +use Icinga\Forms\Config\General\ThemingConfigForm; use Icinga\Forms\ConfigForm; /** - * Form class for application-wide and logging specific settings + * Configuration form for application-wide options */ class GeneralConfigForm extends ConfigForm { /** - * Initialize this configuration form + * {@inheritdoc} */ public function init() { @@ -22,13 +23,15 @@ public function init() } /** - * @see Form::createElements() + * {@inheritdoc} */ public function createElements(array $formData) { $appConfigForm = new ApplicationConfigForm(); $loggingConfigForm = new LoggingConfigForm(); - $this->addElements($appConfigForm->createElements($formData)->getElements()); - $this->addElements($loggingConfigForm->createElements($formData)->getElements()); + $themingConfigForm = new ThemingConfigForm(); + $this->addSubForm($appConfigForm->create($formData)); + $this->addSubForm($loggingConfigForm->create($formData)); + $this->addSubForm($themingConfigForm->create($formData)); } }