From 9845cddcb405f2d26b0391ea64475322eae8dcb2 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Thu, 22 Jun 2017 09:46:12 +0200 Subject: [PATCH] QureyBasedTable: move to ipl --- library/Director/Web/Table/ApplyRulesTable.php | 3 ++- library/Director/Web/Table/ChoicesTable.php | 3 ++- library/Director/Web/Table/ObjectSetTable.php | 3 ++- library/Director/Web/Table/ObjectsTable.php | 3 ++- library/Director/Web/Table/ObjectsTableHost.php | 2 +- library/Director/Web/Table/ObjectsTableService.php | 3 +-- .../Director/Web/Table/ServiceApplyRulesTable.php | 3 ++- library/Director/Web/Table/TemplatesTable.php | 3 ++- .../ipl}/Web/Table/Extension/MultiSelect.php | 2 +- .../ipl}/Web/Table/Extension/QuickSearch.php | 2 +- .../ipl/Web/Table/ZfQueryBasedTable.php} | 14 ++++++++------ 11 files changed, 24 insertions(+), 17 deletions(-) rename library/{Director => vendor/ipl}/Web/Table/Extension/MultiSelect.php (91%) rename library/{Director => vendor/ipl}/Web/Table/Extension/QuickSearch.php (95%) rename library/{Director/Web/Table/QueryBasedTable.php => vendor/ipl/Web/Table/ZfQueryBasedTable.php} (94%) diff --git a/library/Director/Web/Table/ApplyRulesTable.php b/library/Director/Web/Table/ApplyRulesTable.php index 2471cd4d..ef6f8615 100644 --- a/library/Director/Web/Table/ApplyRulesTable.php +++ b/library/Director/Web/Table/ApplyRulesTable.php @@ -7,9 +7,10 @@ use Icinga\Exception\IcingaException; use Icinga\Module\Director\IcingaConfig\AssignRenderer; use ipl\Html\Icon; use ipl\Html\Link; +use ipl\Web\Table\ZfQueryBasedTable; use ipl\Web\Url; -class ApplyRulesTable extends QueryBasedTable +class ApplyRulesTable extends ZfQueryBasedTable { protected $searchColumns = [ 'o.object_name', diff --git a/library/Director/Web/Table/ChoicesTable.php b/library/Director/Web/Table/ChoicesTable.php index d9452410..c0d75d8e 100644 --- a/library/Director/Web/Table/ChoicesTable.php +++ b/library/Director/Web/Table/ChoicesTable.php @@ -5,9 +5,10 @@ namespace Icinga\Module\Director\Web\Table; use Icinga\Module\Director\Db; use ipl\Html\Link; use ipl\Web\Component\ControlsAndContent; +use ipl\Web\Table\ZfQueryBasedTable; use ipl\Web\Url; -class ChoicesTable extends QueryBasedTable +class ChoicesTable extends ZfQueryBasedTable { protected $searchColumns = ['o.object_name']; diff --git a/library/Director/Web/Table/ObjectSetTable.php b/library/Director/Web/Table/ObjectSetTable.php index fb3cf642..1c3c6246 100644 --- a/library/Director/Web/Table/ObjectSetTable.php +++ b/library/Director/Web/Table/ObjectSetTable.php @@ -4,9 +4,10 @@ namespace Icinga\Module\Director\Web\Table; use Icinga\Module\Director\Db; use ipl\Html\Link; +use ipl\Web\Table\ZfQueryBasedTable; use ipl\Web\Url; -class ObjectSetTable extends QueryBasedTable +class ObjectSetTable extends ZfQueryBasedTable { protected $searchColumns = [ 'os.object_name', diff --git a/library/Director/Web/Table/ObjectsTable.php b/library/Director/Web/Table/ObjectsTable.php index e0522847..e9da6b34 100644 --- a/library/Director/Web/Table/ObjectsTable.php +++ b/library/Director/Web/Table/ObjectsTable.php @@ -8,10 +8,11 @@ use Icinga\Module\Director\Objects\IcingaObject; use Icinga\Module\Director\Restriction\HostgroupRestriction; use Icinga\Module\Director\Restriction\ObjectRestriction; use ipl\Html\Link; +use ipl\Web\Table\ZfQueryBasedTable; use ipl\Web\Url; use Zend_Db_Select as ZfSelect; -class ObjectsTable extends QueryBasedTable +class ObjectsTable extends ZfQueryBasedTable { /** @var ObjectRestriction[] */ protected $objectRestrictions; diff --git a/library/Director/Web/Table/ObjectsTableHost.php b/library/Director/Web/Table/ObjectsTableHost.php index 5b20068c..19426584 100644 --- a/library/Director/Web/Table/ObjectsTableHost.php +++ b/library/Director/Web/Table/ObjectsTableHost.php @@ -2,7 +2,7 @@ namespace Icinga\Module\Director\Web\Table; -use Icinga\Module\Director\Web\Table\Extension\MultiSelect; +use ipl\Web\Table\Extension\MultiSelect; class ObjectsTableHost extends ObjectsTable { diff --git a/library/Director/Web/Table/ObjectsTableService.php b/library/Director/Web/Table/ObjectsTableService.php index b3e34866..ee7b5e34 100644 --- a/library/Director/Web/Table/ObjectsTableService.php +++ b/library/Director/Web/Table/ObjectsTableService.php @@ -2,10 +2,9 @@ namespace Icinga\Module\Director\Web\Table; -use Icinga\Module\Director\Db; use Icinga\Module\Director\Db\IcingaObjectFilterHelper; use Icinga\Module\Director\Objects\IcingaService; -use Icinga\Module\Director\Web\Table\Extension\MultiSelect; +use ipl\Web\Table\Extension\MultiSelect; use ipl\Html\Link; use ipl\Web\Url; diff --git a/library/Director/Web/Table/ServiceApplyRulesTable.php b/library/Director/Web/Table/ServiceApplyRulesTable.php index aeae95c5..9ef66402 100644 --- a/library/Director/Web/Table/ServiceApplyRulesTable.php +++ b/library/Director/Web/Table/ServiceApplyRulesTable.php @@ -8,9 +8,10 @@ use Icinga\Module\Director\IcingaConfig\AssignRenderer; use ipl\Html\Icon; use ipl\Html\Link; use ipl\Html\Table; +use ipl\Web\Table\ZfQueryBasedTable; use ipl\Web\Url; -class ServiceApplyRulesTable extends QueryBasedTable +class ServiceApplyRulesTable extends ZfQueryBasedTable { protected $searchColumns = [ 's.object_name', diff --git a/library/Director/Web/Table/TemplatesTable.php b/library/Director/Web/Table/TemplatesTable.php index 48513cfe..88717737 100644 --- a/library/Director/Web/Table/TemplatesTable.php +++ b/library/Director/Web/Table/TemplatesTable.php @@ -6,9 +6,10 @@ use Icinga\Module\Director\Db; use ipl\Html\Html; use ipl\Html\Icon; use ipl\Html\Link; +use ipl\Web\Table\ZfQueryBasedTable; use ipl\Web\Url; -class TemplatesTable extends QueryBasedTable +class TemplatesTable extends ZfQueryBasedTable { protected $searchColumns = ['o.object_name']; diff --git a/library/Director/Web/Table/Extension/MultiSelect.php b/library/vendor/ipl/Web/Table/Extension/MultiSelect.php similarity index 91% rename from library/Director/Web/Table/Extension/MultiSelect.php rename to library/vendor/ipl/Web/Table/Extension/MultiSelect.php index 03f5c007..e16fbef1 100644 --- a/library/Director/Web/Table/Extension/MultiSelect.php +++ b/library/vendor/ipl/Web/Table/Extension/MultiSelect.php @@ -1,6 +1,6 @@ '_next', ]; + /** @var DbConnection */ private $connection; + /** @var \Zend_Db_Adapter_Abstract */ private $db; private $query; protected $searchColumns = []; - public function __construct(Db $connection) + public function __construct(DbConnection $connection) { $this->connection = $connection; $this->db = $connection->getDbAdapter(); @@ -158,7 +160,7 @@ abstract class QueryBasedTable extends Table ]); } - public static function show(ControlsAndContent $controller, Db $db) + public static function show(ControlsAndContent $controller, DbConnection $db) { $table = new static($db); $table->renderTo($controller);