tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Renamed MonitoringView to AbstractView

This commit is contained in:
Thomas Gelf 2013-08-21 00:16:15 +02:00 committed by Eric Lippmann
parent 258d7dbafb
commit bb99358a21
15 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/monitoring/library/Monitoring/View/MonitoringView.php → modules/monitoring/library/Monitoring/View/AbstractView.php
View File

@ -6,7 +6,7 @@ use Icinga\Data\AbstractQuery;
use Icinga\Data\Filter; use Icinga\Data\Filter;
/** /**
* MonitoringView provides consistent views to our Icinga Backends * AbstractView provides consistent views to our Icinga Backends
* *
* TODO: * This could be renamed to AbstractView * TODO: * This could be renamed to AbstractView
* * We might need more complex filters (let's do the simple ones first) * * We might need more complex filters (let's do the simple ones first)
@ -32,7 +32,7 @@ use Icinga\Data\Filter;
* * you can (and should) use a defined set of columns when issueing a query * * you can (and should) use a defined set of columns when issueing a query
* * you can use proper alias names to have an influence on column names * * you can use proper alias names to have an influence on column names
* in the result set * in the result set
* * the MonitoringView behaves like any Query object and provides useful * * the AbstractView behaves like any Query object and provides useful
* methods such as fetchAll, count, fetchPairs and so on * methods such as fetchAll, count, fetchPairs and so on
* *
* If you want to fill a dropdown form element with all your hostgroups * If you want to fill a dropdown form element with all your hostgroups
@ -48,11 +48,11 @@ use Icinga\Data\Filter;
* $formElement->setMultiOptions($pairs); * $formElement->setMultiOptions($pairs);
* </code> * </code>
* *
* MonitoringView is a proxy to your Backend Query. While both are Query objects * AbstractView is a proxy to your Backend Query. While both are Query objects
* providing partially the same interface, they are not directly related to * providing partially the same interface, they are not directly related to
* each other. * each other.
*/ */
class MonitoringView extends AbstractQuery class AbstractView extends AbstractQuery
{ {
/** /**
* Stores the backend-specific Query Object * Stores the backend-specific Query Object
@ -177,7 +177,7 @@ class MonitoringView extends AbstractQuery
} }
// TODO: applyAuthFilters(Auth $auth = null) // TODO: applyAuthFilters(Auth $auth = null)
// MonitoringView will enforce restrictions as provided by the Auth // AbstractView will enforce restrictions as provided by the Auth
// backend // backend
/** /**

2
modules/monitoring/library/Monitoring/View/CommentView.php
View File

@ -2,7 +2,7 @@
namespace Icinga\Module\Monitoring\View; namespace Icinga\Module\Monitoring\View;
class CommentView extends MonitoringView class CommentView extends AbstractView
{ {
protected $query; protected $query;

2
modules/monitoring/library/Monitoring/View/ContactView.php
View File

@ -2,7 +2,7 @@
namespace Icinga\Module\Monitoring\View; namespace Icinga\Module\Monitoring\View;
class ContactView extends MonitoringView class ContactView extends AbstractView
{ {
protected $query; protected $query;

2
modules/monitoring/library/Monitoring/View/ContactgroupView.php
View File

@ -2,7 +2,7 @@
namespace Icinga\Module\Monitoring\View; namespace Icinga\Module\Monitoring\View;
class ContactgroupView extends MonitoringView class ContactgroupView extends AbstractView
{ {
protected $query; protected $query;

2
modules/monitoring/library/Monitoring/View/CustomvarView.php
View File

@ -2,7 +2,7 @@
namespace Icinga\Module\Monitoring\View; namespace Icinga\Module\Monitoring\View;
class CustomvarView extends MonitoringView class CustomvarView extends AbstractView
{ {
protected $query; protected $query;

2
modules/monitoring/library/Monitoring/View/DowntimeView.php
View File

@ -27,7 +27,7 @@ namespace Icinga\Module\Monitoring\View;
/** /**
* Class DowntimeView * Class DowntimeView
*/ */
class DowntimeView extends MonitoringView class DowntimeView extends AbstractView
{ {
/** /**
* Query object * Query object

2
modules/monitoring/library/Monitoring/View/EventHistoryView.php
View File

@ -2,7 +2,7 @@
namespace Icinga\Module\Monitoring\View; namespace Icinga\Module\Monitoring\View;
class EventHistoryView extends MonitoringView class EventHistoryView extends AbstractView
{ {
protected $query; protected $query;

2
modules/monitoring/library/Monitoring/View/HostgroupView.php
View File

@ -2,7 +2,7 @@
namespace Icinga\Module\Monitoring\View; namespace Icinga\Module\Monitoring\View;
class HostgroupView extends MonitoringView class HostgroupView extends AbstractView
{ {
protected $query; protected $query;

2
modules/monitoring/library/Monitoring/View/HoststatusView.php
View File

@ -2,7 +2,7 @@
namespace Icinga\Module\Monitoring\View; namespace Icinga\Module\Monitoring\View;
class HoststatusView extends MonitoringView class HoststatusView extends AbstractView
{ {
protected $query; protected $query;
protected $searchColumn = 'host'; protected $searchColumn = 'host';

2
modules/monitoring/library/Monitoring/View/NotificationView.php
View File

@ -28,7 +28,7 @@ namespace Icinga\Module\Monitoring\View;
/** /**
* NotificationView * NotificationView
*/ */
class NotificationView extends MonitoringView class NotificationView extends AbstractView
{ {
/** /**
* Available columns provided by this view * Available columns provided by this view

2
modules/monitoring/library/Monitoring/View/ServicegroupView.php
View File

@ -2,7 +2,7 @@
namespace Icinga\Module\Monitoring\View; namespace Icinga\Module\Monitoring\View;
class ServicegroupView extends MonitoringView class ServicegroupView extends AbstractView
{ {
protected $query; protected $query;

2
modules/monitoring/library/Monitoring/View/StatusView.php
View File

@ -2,7 +2,7 @@
namespace Icinga\Module\Monitoring\View; namespace Icinga\Module\Monitoring\View;
class StatusView extends MonitoringView class StatusView extends AbstractView
{ {
protected $query; protected $query;
// protected $searchColumn = 'host'; -> besser in der Query, 'search' mitgeben // protected $searchColumn = 'host'; -> besser in der Query, 'search' mitgeben

2
modules/monitoring/test/php/testlib/MonitoringControllerTest.php
View File

@ -170,7 +170,7 @@ abstract class MonitoringControllerTest extends Zend_Test_PHPUnit_ControllerTest
private function requireViews() private function requireViews()
{ {
$module = $this->moduleDir; $module = $this->moduleDir;
require_once($module.'library/Monitoring/View/MonitoringView.php'); require_once($module.'library/Monitoring/View/AbstractView.php');
$this->requireFolder('library/Monitoring/View/'); $this->requireFolder('library/Monitoring/View/');
} }

2
test/php/library/Icinga/Web/Paginator/Adapter/QueryAdapterTest.php
View File

@ -20,7 +20,7 @@ require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/Quer
require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat.php'; require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat.php';
require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusQuery.php'; require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusQuery.php';
require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/HostStatusView.php'; require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/HostStatusView.php';
require_once '../../modules/monitoring/library/Monitoring/View/MonitoringView.php'; require_once '../../modules/monitoring/library/Monitoring/View/AbstractView.php';
require_once '../../modules/monitoring/library/Monitoring/View/StatusView.php'; require_once '../../modules/monitoring/library/Monitoring/View/StatusView.php';
require_once '../../library/Icinga/Protocol/AbstractQuery.php'; require_once '../../library/Icinga/Protocol/AbstractQuery.php';

2
test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php
View File

@ -24,7 +24,7 @@ require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/Quer
require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat.php'; require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat.php';
require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusQuery.php'; require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusQuery.php';
require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/HostStatusView.php'; require_once '../../modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/HostStatusView.php';
require_once '../../modules/monitoring/library/Monitoring/View/MonitoringView.php'; require_once '../../modules/monitoring/library/Monitoring/View/AbstractView.php';
require_once '../../modules/monitoring/library/Monitoring/View/StatusView.php'; require_once '../../modules/monitoring/library/Monitoring/View/StatusView.php';
require_once '../../library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php'; require_once '../../library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php';