mirror of
https://github.com/Icinga/icingaweb2.git
synced 2025-07-29 16:54:04 +02:00
parent
21e560cb3b
commit
9cd4c2f856
@ -75,14 +75,15 @@ class PreferenceController extends BasePreferenceController
|
|||||||
{
|
{
|
||||||
$form = new GeneralForm();
|
$form = new GeneralForm();
|
||||||
$form->setConfiguration(IcingaConfig::app());
|
$form->setConfiguration(IcingaConfig::app());
|
||||||
$form->setRequest($this->_request);
|
$form->setRequest($this->getRequest());
|
||||||
|
|
||||||
if ($form->isSubmittedAndValid()) {
|
if ($form->isSubmittedAndValid()) {
|
||||||
$preferences = $form->getPreferences();
|
$preferences = $form->getPreferences();
|
||||||
$userPreferences = $this->getRequest()->getUser()->getPreferences();
|
$userPreferences = $this->getRequest()->getUser()->getPreferences();
|
||||||
|
|
||||||
$userPreferences->startTransaction();
|
$userPreferences->startTransaction();
|
||||||
foreach ($preferences as $key => $value) {
|
foreach ($preferences as $key => $value) {
|
||||||
if ($value == "") {
|
if ($value === '') {
|
||||||
$userPreferences->remove($key);
|
$userPreferences->remove($key);
|
||||||
} else {
|
} else {
|
||||||
$userPreferences->set($key, $value);
|
$userPreferences->set($key, $value);
|
||||||
|
@ -31,6 +31,7 @@ namespace Icinga\Form\Preference;
|
|||||||
use \Icinga\Application\Config as IcingaConfig;
|
use \Icinga\Application\Config as IcingaConfig;
|
||||||
use \Icinga\Application\Icinga;
|
use \Icinga\Application\Icinga;
|
||||||
use \Icinga\Application\DbAdapterFactory;
|
use \Icinga\Application\DbAdapterFactory;
|
||||||
|
use \Icinga\User\Preferences;
|
||||||
use \Icinga\Web\Form;
|
use \Icinga\Web\Form;
|
||||||
use \Icinga\Web\Form\Validator\TimeFormatValidator;
|
use \Icinga\Web\Form\Validator\TimeFormatValidator;
|
||||||
use \Icinga\Web\Form\Validator\DateFormatValidator;
|
use \Icinga\Web\Form\Validator\DateFormatValidator;
|
||||||
@ -51,7 +52,14 @@ class GeneralForm extends Form
|
|||||||
*
|
*
|
||||||
* @var IcingaConfig
|
* @var IcingaConfig
|
||||||
*/
|
*/
|
||||||
private $config = null;
|
private $config;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The preference object to use instead of the one from the user (used for testing)
|
||||||
|
*
|
||||||
|
* @var Zend_Config
|
||||||
|
*/
|
||||||
|
private $preferences;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set the configuration to be used for this form when no preferences are set yet
|
* Set the configuration to be used for this form when no preferences are set yet
|
||||||
@ -63,6 +71,29 @@ class GeneralForm extends Form
|
|||||||
$this->config = $cfg;
|
$this->config = $cfg;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set preferences to be used instead of the one from the user object (used for testing)
|
||||||
|
*
|
||||||
|
* @param Zend_Config $prefs
|
||||||
|
*/
|
||||||
|
public function setUserPreferences($prefs)
|
||||||
|
{
|
||||||
|
$this->preferences = $prefs;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the preferences of the user or the overwritten ones
|
||||||
|
*
|
||||||
|
* @return Zend_Config
|
||||||
|
*/
|
||||||
|
public function getUserPreferences()
|
||||||
|
{
|
||||||
|
if ($this->preferences) {
|
||||||
|
return $this->preferences;
|
||||||
|
}
|
||||||
|
return $this->getRequest()->getUser()->getPreferences();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add a select field for setting the user's timezone.
|
* Add a select field for setting the user's timezone.
|
||||||
*
|
*
|
||||||
@ -78,7 +109,7 @@ class GeneralForm extends Form
|
|||||||
$tzList[$tz] = $tz;
|
$tzList[$tz] = $tz;
|
||||||
}
|
}
|
||||||
$helptext = 'Use the following timezone for dates and times';
|
$helptext = 'Use the following timezone for dates and times';
|
||||||
$prefs = $this->getRequest()->getUser()->getPreferences();
|
$prefs = $this->getUserPreferences();
|
||||||
$useGlobalTimezone = $this->getRequest()->getParam('default_timezone', !$prefs->has('app.timezone'));
|
$useGlobalTimezone = $this->getRequest()->getParam('default_timezone', !$prefs->has('app.timezone'));
|
||||||
|
|
||||||
$selectTimezone = new Zend_Form_Element_Select(
|
$selectTimezone = new Zend_Form_Element_Select(
|
||||||
@ -116,7 +147,7 @@ class GeneralForm extends Form
|
|||||||
*/
|
*/
|
||||||
private function addDateFormatSettings(Zend_Config $cfg)
|
private function addDateFormatSettings(Zend_Config $cfg)
|
||||||
{
|
{
|
||||||
$prefs = $this->getRequest()->getUser()->getPreferences();
|
$prefs = $this->getUserPreferences();
|
||||||
$useGlobalDateFormat = $this->getRequest()->getParam('default_date_format', !$prefs->has('app.dateFormat'));
|
$useGlobalDateFormat = $this->getRequest()->getParam('default_date_format', !$prefs->has('app.dateFormat'));
|
||||||
$useGlobalTimeFormat = $this->getRequest()->getParam('default_time_format', !$prefs->has('app.timeFormat'));
|
$useGlobalTimeFormat = $this->getRequest()->getParam('default_time_format', !$prefs->has('app.timeFormat'));
|
||||||
|
|
||||||
|
113
test/php/application/forms/Preference/GeneralFormTest.php
Normal file
113
test/php/application/forms/Preference/GeneralFormTest.php
Normal file
@ -0,0 +1,113 @@
|
|||||||
|
<?php
|
||||||
|
// {{{ICINGA_LICENSE_HEADER}}}
|
||||||
|
/**
|
||||||
|
* This file is part of Icinga 2 Web.
|
||||||
|
*
|
||||||
|
* Icinga 2 Web - Head for multiple monitoring backends.
|
||||||
|
* Copyright (C) 2013 Icinga Development Team
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License
|
||||||
|
* as published by the Free Software Foundation; either version 2
|
||||||
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
*
|
||||||
|
* @copyright 2013 Icinga Development Team <info@icinga.org>
|
||||||
|
* @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2
|
||||||
|
* @author Icinga Development Team <info@icinga.org>
|
||||||
|
*/
|
||||||
|
// {{{ICINGA_LICENSE_HEADER}}}
|
||||||
|
|
||||||
|
namespace Test\Icinga\Form\Preference;
|
||||||
|
|
||||||
|
|
||||||
|
require_once('Zend/Config.php');
|
||||||
|
require_once('Zend/Config/Ini.php');
|
||||||
|
require_once('Zend/Form/Element/Select.php');
|
||||||
|
require_once(realpath('library/Icinga/Web/Form/BaseFormTest.php'));
|
||||||
|
require_once(realpath('../../application/forms/Preference/GeneralForm.php'));
|
||||||
|
require_once(realpath('../../library/Icinga/User/Preferences/ChangeSet.php'));
|
||||||
|
require_once(realpath('../../library/Icinga/User/Preferences.php'));
|
||||||
|
|
||||||
|
use Test\Icinga\Web\Form\BaseFormTest;
|
||||||
|
use \Icinga\Web\Form;
|
||||||
|
use \DOMDocument;
|
||||||
|
use \Zend_Config;
|
||||||
|
use \Zend_View;
|
||||||
|
use Icinga\User\Preferences;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test for general form, mainly testing enable/disable behaviour
|
||||||
|
*/
|
||||||
|
class GeneralFormTest extends \Test\Icinga\Web\Form\BaseFormTest
|
||||||
|
{
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test whether fields using the default values have input disabled
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public function testDisableFormIfUsingDefault()
|
||||||
|
{
|
||||||
|
date_default_timezone_set('UTC');
|
||||||
|
$form = $this->getRequestForm(array(), 'Icinga\Form\Preference\GeneralForm');
|
||||||
|
$form->setRequest($this->getRequest());
|
||||||
|
$form->setConfiguration(
|
||||||
|
new Zend_Config(
|
||||||
|
array(
|
||||||
|
'timezone' => 'UTC'
|
||||||
|
)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
$form->setUserPreferences(
|
||||||
|
new Preferences(
|
||||||
|
array()
|
||||||
|
)
|
||||||
|
);
|
||||||
|
$form->create();
|
||||||
|
$this->assertSame(
|
||||||
|
1,
|
||||||
|
$form->getElement('timezone')->getAttrib('disabled'),
|
||||||
|
'Asserting form elements to be disabled when not set in a preference'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test whether fields with preferences are enabled
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public function testEnsableFormIfUsingPreference()
|
||||||
|
{
|
||||||
|
date_default_timezone_set('UTC');
|
||||||
|
$form = $this->getRequestForm(array(), 'Icinga\Form\Preference\GeneralForm');
|
||||||
|
$form->setRequest($this->getRequest());
|
||||||
|
$form->setConfiguration(
|
||||||
|
new Zend_Config(
|
||||||
|
array(
|
||||||
|
'timezone' => 'UTC'
|
||||||
|
)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
$form->setUserPreferences(
|
||||||
|
new Preferences(
|
||||||
|
array(
|
||||||
|
'app.timezone' => 'Europe/Berlin'
|
||||||
|
)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
$form->create();
|
||||||
|
$this->assertSame(
|
||||||
|
null,
|
||||||
|
$form->getElement('timezone')->getAttrib('disabled'),
|
||||||
|
'Asserting form elements to be disabled when not set in a preference'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user