Data: controller, table, form - ipl adjustments

application/controllers/DataController.php

@@ -2,59 +2,67 @@
 
 namespace Icinga\Module\Director\Controllers;
 
+use Icinga\Module\Director\Forms\DirectorDatalistentryForm;
+use Icinga\Module\Director\Forms\DirectorDatalistForm;
 use Icinga\Module\Director\Objects\DirectorDatalist;
 use Icinga\Module\Director\Web\Controller\ActionController;
+use Icinga\Module\Director\Web\Table\DatafieldTable;
+use Icinga\Module\Director\Web\Table\DatalistEntryTable;
+use Icinga\Module\Director\Web\Table\DatalistTable;
+use ipl\Html\Link;
 
 class DataController extends ActionController
 {
     public function listsAction()
     {
-        $this->view->addLink = $this->view->qlink(
+        $this->actions()->add(Link::create(
             $this->translate('Add'),
             'director/data/list',
             null,
-            array('class' => 'icon-plus')
+            ['class' => 'icon-plus']
-        );
+        ));
 
         $this->setDataTabs()->activate('datalist');
-        $this->view->title = $this->translate('Data lists');
+        $this->addTitle($this->translate('Data lists'));
-        $this->prepareAndRenderTable('datalist');
+        $table = new DatalistTable($this->db());
-        $this->provideFilterEditorForTable($this->view->table);
+        $table->renderTo($this);
+//        $this->prepareAndRenderTable('datalist');
+//        $this->provideFilterEditorForTable($this->view->table);
     }
 
     public function listAction()
     {
-        $this->view->stayHere = true;
+        // TODO: check this
+        // $this->view->stayHere = true;
 
-        $form = $this->view->form = $this->loadForm('directorDatalist')
+        $form = DirectorDatalistForm::load()
             ->setSuccessUrl('director/data/lists')
             ->setDb($this->db());
+        $this->content()->add($form);
 
-        if ($id = $this->getRequest()->getUrl()->shift('id')) {
+        if ($id = $this->url()->shift('id')) {
             $form->loadObject($id);
-            $this->view->title = sprintf(
+            $this->addTitle(
                 $this->translate('Data list: %s'),
                 $form->getObject()->list_name
             );
 
-            $this->view->addLink = $this->view->qlink(
+            $this->actions()->add(Link::create(
                 $this->translate('back'),
                 'director/data/list',
                 null,
-                array('class' => 'icon-left-big')
+                ['class' => 'icon-left-big']
-            );
+            ))->add(Link::create(
-
-            $this->view->addLink .= $this->view->qlink(
                 $this->translate('Entries'),
                 'director/data/listentry',
-                array('list_id' => $id),
+                ['list_id' => $id],
-                array(
+                [
                     'class'            => 'icon-doc-text',
                     'data-base-target' => '_next'
-                )
+                ]
-            );
+            ));
 
-            $this->getTabs()->add('editlist', array(
+            $this->tabs()->add('editlist', array(
                 'url'       => 'director/data/list' . '?id=' . $id,
                 'label'     => $this->translate('Edit list'),
             ))->add('entries', array(
@@ -62,16 +70,15 @@ class DataController extends ActionController
                 'label'     => $this->translate('List entries'),
             ))->activate('editlist');
         } else {
-            $this->view->title = $this->translate('Add');
+            $this->addTitle($title = $this->translate('Add'));
 
-            $this->getTabs()->add('addlist', array(
+            $this->tabs()->add('addlist', array(
                 'url'       => 'director/data/list',
-                'label'     => $this->view->title,
+                'label'     => $title,
             ))->activate('addlist');
         }
 
         $form->handleRequest();
-        $this->setViewScript('object/form');
     }
 
     public function indexAction()
@@ -83,23 +90,24 @@ class DataController extends ActionController
         }
 
         if ($edit) {
-            $this->view->title = $this->translate('Edit list');
+            $this->addTitle($title = $this->translate('Edit list'));
+
             $this->getTabs()->add('editlist', array(
                 'url'       => 'director/datalist/edit' . '?id=' . $id,
-                'label'     => $this->view->title,
+                'label'     => $title,
             ))->add('entries', array(
                 'url'       => 'director/data/listentry' . '?list_id=' . $id,
                 'label'     => $this->translate('List entries'),
             ))->activate('editlist');
         } else {
-            $this->view->title = $this->translate('Add list');
+            $this->addTitle($title = $this->translate('Add list'));
             $this->getTabs()->add('addlist', array(
                 'url'       => 'director/datalist/add',
-                'label'     => $this->view->title,
+                'label'     => $title,
             ))->activate('addlist');
         }
 
-        $form = $this->view->form = $this->loadForm('directorDatalist')
+        $form = DirectorDatalistForm::load()
             ->setSuccessUrl('director/data/lists')
             ->setDb($this->db());
 
@@ -108,68 +116,80 @@ class DataController extends ActionController
         }
 
         $form->handleRequest();
-
-        $this->render('object/form', null, true);
     }
 
 
     public function fieldsAction()
     {
-        $this->view->addLink = $this->view->qlink(
+        $this->actions()->add(Link::create(
             $this->translate('Add'),
             'director/datafield/add',
             null,
-            array('class' => 'icon-plus')
+            ['class' => 'icon-plus']
-        );
+        ));
 
         $this->setDataTabs()->activate('datafield');
-        $this->view->title = $this->translate('Data fields');
+        $this->addTitle($this->translate('Data fields'));
-        $this->prepareAndRenderTable('datafield');
+        $this->content()->add(new DatafieldTable($this->db()));
-        $this->provideFilterEditorForTable($this->view->table);
+        // $this->prepareAndRenderTable('datafield');
+        // $this->provideFilterEditorForTable($this->view->table);
     }
 
     public function listentryAction()
     {
-        $this->view->stayHere = true;
+        // $this->view->stayHere = true;
 
-        $url = $this->getRequest()->getUrl();
+        $url = $this->url();
         $entryName = $url->shift('entry_name');
         $list = DirectorDatalist::load($url->shift('list_id'), $this->db());
         $listId = $list->id;
 
-        $form = $this->view->form = $this->loadForm('directorDatalistentry')
+        $form = DirectorDatalistentryForm::load()
             ->setSuccessUrl('director/data/listentry?list_id=' . $listId)
             ->setList($list)
             ->setDb($this->db());
 
         if ($entryName) {
-            $form->loadObject(array(
+            $form->loadObject([
                 'list_id'    => $listId,
                 'entry_name' => $entryName
-            ));
+            ]);
-            $this->view->addLink = $this->view->qlink(
+            $this->actions()->add(Link::create(
                 $this->translate('back'),
-                'director/data/listentry' . '?list_id=' . $listId,
+                'director/data/listentry',
-                null,
+                ['list_id' => $listId],
-                array('class' => 'icon-left-big')
+                ['class' => 'icon-left-big']
-            );
+            ));
         }
-
         $form->handleRequest();
 
+        $this->content()->add($form);
 
-        $this->view->title = $this->translate('List entries')
+        $this->addTitle($title = $this->translate('List entries')
-            . ': ' . $list->list_name;
+            . ': ' . $list->list_name);
-        $this->getTabs()->add('editlist', array(
+        $this->tabs()->add('editlist', [
             'url'       => 'director/data/list' . '?id=' . $listId,
             'label'     => $this->translate('Edit list'),
-        ))->add('datalistentry', array(
+        ])->add('datalistentry', [
             'url'       => 'director/data/listentry' . '?list_id=' . $listId,
-            'label'     => $this->view->title,
+            'label'     => $title,
-        ))->activate('datalistentry');
+        ])->activate('datalistentry');
 
-        $this->prepareTable('datalistEntry')->setList($list);
+        $table = new DatalistEntryTable($this->db());
-        $this->setViewScript('objects/table');
+        $table->attributes()->set('data-base-target', '_self');
+        $table->setList($list);
+        $this->content()->add($table);
+    }
+
+    protected function setDataTabs()
+    {
+        return $this->tabs()->add('datafield', [
+            'label' => $this->translate('Data fields'),
+            'url'   => 'director/data/fields'
+        ])->add('datalist', [
+            'label' => $this->translate('Data lists'),
+            'url'   => 'director/data/lists'
+        ]);
     }
 
     protected function prepareTable($name)

application/forms/DirectorDatalistentryForm.php

@@ -22,7 +22,7 @@ class DirectorDatalistEntryForm extends DirectorObjectForm
         ));
 
         $this->addElement('text', 'entry_value', array(
-            'label'       => $this->translate('Value'),
+            'label'       => $this->translate('Label'),
             'required'    => true,
             'description' => $this->translate(
                 'This will be the visible caption for this entry'

application/tables/DatalistTable.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace Icinga\Module\Director\Tables;
-
-use Icinga\Module\Director\Web\Table\QuickTable;
-
-class DatalistTable extends QuickTable
-{
-    protected $searchColumns = array(
-        'list_name',
-    );
-
-    public function getColumns()
-    {
-        return array(
-            'id'        => 'l.id',
-            'list_name' => 'l.list_name',
-            'owner'     => 'l.owner',
-        );
-    }
-
-    protected function getActionUrl($row)
-    {
-        return $this->url(
-            'director/data/listentry',
-            array('list_id' => $row->id)
-        );
-    }
-
-    public function getTitles()
-    {
-        $view = $this->view();
-        return array(
-            'list_name' => $view->translate('List name'),
-            // 'owner'     => $view->translate('Owner'),
-        );
-    }
-
-    public function getBaseQuery()
-    {
-        return $this->db()->select()->from(
-            array('l' => 'director_datalist'),
-            array()
-        )->order('list_name ASC');
-    }
-}

library/Director/Web/Controller/ActionController.php

@@ -161,24 +161,6 @@ abstract class ActionController extends Controller implements ControlsAndContent
         return $this->view->tabs;
     }
 
-    protected function setDataTabs()
-    {
-        $this->view->tabs = Widget::create('tabs')->add(
-            'datafield',
-            array(
-                'label' => $this->translate('Data fields'),
-                'url'   => 'director/data/fields'
-            )
-        )->add(
-            'datalist',
-            array(
-                'label' => $this->translate('Data lists'),
-                'url'   => 'director/data/lists'
-            )
-        );
-        return $this->view->tabs;
-    }
-
     /**
      * @param string $permission
      * @return $this

library/Director/Web/Table/DatafieldTable.php

@@ -1,12 +1,13 @@
 <?php
 
-namespace Icinga\Module\Director\Tables;
+namespace Icinga\Module\Director\Web\Table;
 
-use Icinga\Module\Director\Web\Table\QuickTable;
+use ipl\Html\Link;
+use ipl\Web\Table\ZfQueryBasedTable;
 use Zend_Db_Adapter_Abstract as ZfDbAdapter;
 use Zend_Db_Select as ZfDbSelect;
 
-class DatafieldTable extends QuickTable
+class DatafieldTable extends ZfQueryBasedTable
 {
     protected $searchColumns = array(
         'varname',
@@ -26,23 +27,31 @@ class DatafieldTable extends QuickTable
         );
     }
 
-    protected function getActionUrl($row)
+    public function renderRow($row)
     {
-        return $this->url('director/datafield/edit', array('id' => $row->id));
+        return $this::tr([
+            $this::td(Link::create(
+                $row->caption,
+                'director/datafield/edit',
+                ['id' => $row->id]
+            )),
+            $this::td($row->varname),
+            $this::td($row->assigned_fields),
+            $this::td($row->assigned_vars)
+        ]);
     }
 
-    public function getTitles()
+    public function getColumnsToBeRendered()
     {
-        $view = $this->view();
         return array(
-            'caption'         => $view->translate('Label'),
+            $this->translate('Label'),
-            'varname'         => $view->translate('Field name'),
+            $this->translate('Field name'),
-            'assigned_fields' => $view->translate('# Used'),
+            $this->translate('# Used'),
-            'assigned_vars'   => $view->translate('# Vars'),
+            $this->translate('# Vars'),
         );
     }
 
-    public function getBaseQuery()
+    public function prepareQuery()
     {
         $db = $this->db();
         $fieldTypes = array('command', 'host', 'notification', 'service', 'user');
@@ -60,7 +69,7 @@ class DatafieldTable extends QuickTable
 
         return $db->select()->from(
             array('df' => 'director_datafield'),
-            array()
+            $this->getColumns()
         )->joinLeft(
             array('used_fields' => $db->select()->union($fieldsQueries, ZfDbSelect::SQL_UNION_ALL)),
             'used_fields.datafield_id = df.id',
@@ -72,17 +81,6 @@ class DatafieldTable extends QuickTable
         )->group('df.id')->group('df.varname')->order('caption ASC');
     }
 
-    public function count()
-    {
-        $db = $this->db();
-        return $db->fetchOne(
-            $db->select()->from(
-                array('sub' => $this->getBaseQuery()->columns($this->getColumns())),
-                'COUNT(*)'
-            )
-        );
-    }
-
     /**
      * @param $type
      * @param ZfDbAdapter $db

library/Director/Web/Table/DatalistEntryTable.php

@@ -1,11 +1,12 @@
 <?php
 
-namespace Icinga\Module\Director\Tables;
+namespace Icinga\Module\Director\Web\Table;
 
 use Icinga\Module\Director\Objects\DirectorDatalist;
-use Icinga\Module\Director\Web\Table\QuickTable;
+use ipl\Html\Link;
+use ipl\Web\Table\ZfQueryBasedTable;
 
-class DatalistEntryTable extends QuickTable
+class DatalistEntryTable extends ZfQueryBasedTable
 {
     protected $datalist;
 
@@ -34,28 +35,30 @@ class DatalistEntryTable extends QuickTable
         );
     }
 
-    protected function getActionUrl($row)
+    public function renderRow($row)
     {
-        return $this->url('director/data/listentry/edit', array(
+        return $this::tr([
-            'list_id'    => $row->list_id,
+            $this::td(Link::create($row->entry_name, 'director/data/listentry/edit', [
-            'entry_name' => $row->entry_name,
+                'list_id'    => $row->list_id,
-        ));
+                'entry_name' => $row->entry_name,
+            ])),
+            $this::td($row->entry_value)
+        ]);
     }
 
-    public function getTitles()
+    public function getColumnsToBeRendered()
     {
-        $view = $this->view();
         return array(
-            'entry_name'    => $view->translate('Key'),
+            'entry_name'    => $this->translate('Key'),
-            'entry_value'   => $view->translate('Label'),
+            'entry_value'   => $this->translate('Label'),
         );
     }
 
-    public function getBaseQuery()
+    public function prepareQuery()
     {
         return $this->db()->select()->from(
             array('l' => 'director_datalist_entry'),
-            array()
+            $this->getColumns()
         )->where(
             'l.list_id = ?',
             $this->getList()->id

library/Director/Web/Table/DatalistTable.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace Icinga\Module\Director\Web\Table;
+
+use ipl\Html\Link;
+use ipl\Web\Table\ZfQueryBasedTable;
+
+class DatalistTable extends ZfQueryBasedTable
+{
+    protected $searchColumns = ['list_name'];
+
+    public function getColumns()
+    {
+        return [
+            'id'        => 'l.id',
+            'list_name' => 'l.list_name',
+        ];
+    }
+
+    public function renderRow($row)
+    {
+        return $this::tr($this::td(Link::create(
+            $row->list_name,
+            'director/data/listentry',
+            array('list_id' => $row->id)
+        )));
+    }
+
+    public function getColumnsToBeRendered()
+    {
+        return [$this->translate('List name')];
+    }
+
+    public function prepareQuery()
+    {
+        return $this->db()->select()->from(
+            ['l' => 'director_datalist'],
+            $this->getColumns()
+        )->order('list_name ASC');
+    }
+}

library/Director/Web/Table/QuickTable.php

@@ -15,7 +15,7 @@ use Icinga\Exception\QueryException;
 use Icinga\Module\Director\Db;
 use Icinga\Module\Director\PlainObjectRenderer;
 use Icinga\Web\Request;
-use Icinga\Web\Url;
+use ipl\Web\Url;
 use Icinga\Web\View;
 use Icinga\Web\Widget;
 use Icinga\Web\Widget\Paginator;