timeperiod: remove legacy options

application/forms/IcingaTimePeriodForm.php

@@ -10,13 +10,13 @@ class IcingaTimePeriodForm extends DirectorObjectForm
     {
         $isTemplate = isset($_POST['object_type']) && $_POST['object_type'] === 'template';
         $this->addElement('select', 'object_type', array(
-            'label' => $this->translate('Object type'),
+            'label'       => $this->translate('Object type'),
             'description' => $this->translate('Whether this should be a template'),
-            'multiOptions' => array(
-                null => '- please choose -',
-                'object' => 'Timeperiod object',
-                'template' => 'Timeperiod template',
-            )
+            'class'       => 'autosubmit',
+            'multiOptions' => $this->optionalEnum(array(
+                'object'   => $this->translate('Timeperiod object'),
+                'template' => $this->translate('Timeperiod template'),
+            ))
         ));
 
         if ($isTemplate) {
@@ -43,7 +43,6 @@ class IcingaTimePeriodForm extends DirectorObjectForm
             'description' => $this->translate('the update method'),
         ));
 
-        $this->addZoneElement();
         $this->addImportsElement();
     }
 }

application/tables/IcingaTimePeriodTable.php

@@ -16,7 +16,6 @@ class IcingaTimePeriodTable extends QuickTable
             'id'            => 't.id',
             'timeperiod'    => 't.object_name',
             'display_name'  => 't.display_name',
-            'zone'          => 'z.object_name',
         );
     }
 
@@ -31,7 +30,6 @@ class IcingaTimePeriodTable extends QuickTable
         return array(
             'timeperiod' => $view->translate('Timeperiod'),
             'display_name'  => $view->translate('Display Name'),
-            'zone'     => $view->translate('Zone'),
         );
     }
 
@@ -41,10 +39,6 @@ class IcingaTimePeriodTable extends QuickTable
         $query = $db->select()->from(
             array('t' => 'icinga_timeperiod'),
             array()
-        )->joinLeft(
-            array('z' => 'icinga_zone'),
-            't.zone_id = z.id',
-            array()
         );
 
         return $query;