mirror of
https://github.com/Icinga/icingaweb2.git
synced 2025-07-21 21:04:25 +02:00
Monitoring: Fix remaining usages of namespace Monitoring without Icinga\Module prefix
refs #4586
This commit is contained in:
parent
3e4d1aa2fb
commit
1b858cbdb4
@ -51,7 +51,7 @@ class ObjectRemappingView implements AccessorStrategy
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* When implementing your own Mapper, this contains the static mapping rules.
|
* When implementing your own Mapper, this contains the static mapping rules.
|
||||||
* @see Monitoring\Backend\Statusdat\DataView\StatusdatServiceView for an example
|
* @see Icinga\Module\Monitoring\Backend\Statusdat\DataView\StatusdatServiceView for an example
|
||||||
*
|
*
|
||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
|
@ -35,12 +35,12 @@ use \Icinga\Web\Controller\BaseConfigController;
|
|||||||
use \Icinga\Web\Widget\Tab;
|
use \Icinga\Web\Widget\Tab;
|
||||||
use \Icinga\Web\Url;
|
use \Icinga\Web\Url;
|
||||||
|
|
||||||
use \Monitoring\Form\Config\ConfirmRemovalForm;
|
use Icinga\Module\Monitoring\Form\Config\ConfirmRemovalForm;
|
||||||
use \Monitoring\Form\Config\Backend\EditBackendForm;
|
use Icinga\Module\Monitoring\Form\Config\Backend\EditBackendForm;
|
||||||
use \Monitoring\Form\Config\Backend\CreateBackendForm;
|
use Icinga\Module\Monitoring\Form\Config\Backend\CreateBackendForm;
|
||||||
|
|
||||||
use \Monitoring\Form\Config\Instance\EditInstanceForm;
|
use Icinga\Module\Monitoring\Form\Config\Instance\EditInstanceForm;
|
||||||
use \Monitoring\Form\Config\Instance\CreateInstanceForm;
|
use Icinga\Module\Monitoring\Form\Config\Instance\CreateInstanceForm;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Configuration controller for editing monitoring resources
|
* Configuration controller for editing monitoring resources
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
// {{{ICINGA_LICENSE_HEADER}}}
|
// {{{ICINGA_LICENSE_HEADER}}}
|
||||||
|
|
||||||
|
|
||||||
namespace Monitoring\Form\Config\Backend;
|
namespace Icinga\Module\Monitoring\Form\Config\Backend;
|
||||||
|
|
||||||
use \Zend_Config;
|
use \Zend_Config;
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
*/
|
*/
|
||||||
// {{{ICINGA_LICENSE_HEADER}}}
|
// {{{ICINGA_LICENSE_HEADER}}}
|
||||||
|
|
||||||
namespace Monitoring\Form\Config\Backend;
|
namespace Icinga\Module\Monitoring\Form\Config\Backend;
|
||||||
|
|
||||||
use \Zend_Config;
|
use \Zend_Config;
|
||||||
use \Icinga\Web\Form;
|
use \Icinga\Web\Form;
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
// {{{ICINGA_LICENSE_HEADER}}}
|
// {{{ICINGA_LICENSE_HEADER}}}
|
||||||
|
|
||||||
|
|
||||||
namespace Monitoring\Form\Config;
|
namespace Icinga\Module\Monitoring\Form\Config;
|
||||||
|
|
||||||
use Icinga\Web\Form;
|
use Icinga\Web\Form;
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
// {{{ICINGA_LICENSE_HEADER}}}
|
// {{{ICINGA_LICENSE_HEADER}}}
|
||||||
|
|
||||||
|
|
||||||
namespace Monitoring\Form\Config\Instance;
|
namespace Icinga\Module\Monitoring\Form\Config\Instance;
|
||||||
|
|
||||||
use \Icinga\Web\Form;
|
use \Icinga\Web\Form;
|
||||||
use \Zend_Config;
|
use \Zend_Config;
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
// {{{ICINGA_LICENSE_HEADER}}}
|
// {{{ICINGA_LICENSE_HEADER}}}
|
||||||
|
|
||||||
|
|
||||||
namespace Monitoring\Form\Config\Instance;
|
namespace Icinga\Module\Monitoring\Form\Config\Instance;
|
||||||
|
|
||||||
use \Zend_Config;
|
use \Zend_Config;
|
||||||
use \Icinga\Web\Form;
|
use \Icinga\Web\Form;
|
||||||
|
@ -27,7 +27,7 @@ There are no matching history entries right now
|
|||||||
<td><?= $this->escape($event->host_name) ?></td>
|
<td><?= $this->escape($event->host_name) ?></td>
|
||||||
<? endif ?>
|
<? endif ?>
|
||||||
|
|
||||||
<? if (! $object instanceof Monitoring\Object\Service): ?>
|
<? if (! $object instanceof Icinga\Module\Monitoring\Object\Service): ?>
|
||||||
<td>
|
<td>
|
||||||
<? if ($object): ?>
|
<? if ($object): ?>
|
||||||
<a href="<?= $this->href('monitoring/show/service',array(
|
<a href="<?= $this->href('monitoring/show/service',array(
|
||||||
|
@ -7,7 +7,7 @@ use Icinga\Data\Db\Connection;
|
|||||||
/**
|
/**
|
||||||
* This class provides an easy-to-use interface to the IDO database
|
* This class provides an easy-to-use interface to the IDO database
|
||||||
*
|
*
|
||||||
* You should usually not directly use this class but go through Monitoring\Backend.
|
* You should usually not directly use this class but go through Icinga\Module\Monitoring\Backend.
|
||||||
*
|
*
|
||||||
* New MySQL indexes:
|
* New MySQL indexes:
|
||||||
* <code>
|
* <code>
|
||||||
|
@ -13,7 +13,7 @@ use Icinga\Data\Filter;
|
|||||||
*
|
*
|
||||||
* You should not directly instantiate such a view but always go through the
|
* You should not directly instantiate such a view but always go through the
|
||||||
* Monitoring Backend. Using the Backend's select() method selecting from
|
* Monitoring Backend. Using the Backend's select() method selecting from
|
||||||
* 'virtualtable' returns a Monitoring\View\VirtualtableView instance.
|
* 'virtualtable' returns a Icinga\Module\Monitoring\View\VirtualtableView instance.
|
||||||
*
|
*
|
||||||
* Usage example:
|
* Usage example:
|
||||||
* <code>
|
* <code>
|
||||||
|
@ -1,47 +0,0 @@
|
|||||||
<?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 Tests\Icinga\Test;
|
|
||||||
|
|
||||||
require_once realpath(__DIR__ . '/../../../../../library/Icinga/Test/BaseTestCase.php');
|
|
||||||
|
|
||||||
use \Icinga\Test\BaseTestCase;
|
|
||||||
|
|
||||||
require_once BaseTestCase::$appDir . '/forms/Authentication/LoginForm.php';
|
|
||||||
require_once BaseTestCase::$moduleDir . '/monitoring/application/forms/Config/ConfirmRemovalForm.php';
|
|
||||||
|
|
||||||
class BaseTestCaseFormTest extends BaseTestCase
|
|
||||||
{
|
|
||||||
public function testFormCreation()
|
|
||||||
{
|
|
||||||
$form1 = $this->createForm('Icinga\Form\Authentication\LoginForm');
|
|
||||||
$this->assertInstanceOf('Icinga\Web\Form', $form1);
|
|
||||||
$form2 = $this->createForm('Monitoring\Form\Config\ConfirmRemovalForm');
|
|
||||||
$this->assertInstanceOf('Icinga\Web\Form', $form2);
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
x
Reference in New Issue
Block a user