1 files changed, 100 insertions, 7 deletions

diff --git a/library/Director/Web/Table/ApplyRulesTable.php b/library/Director/Web/Table/ApplyRulesTable.php
index a861bac..a5379b5 100644
--- a/library/Director/Web/Table/ApplyRulesTable.php
+++ b/library/Director/Web/Table/ApplyRulesTable.php
@@ -6,6 +6,7 @@ use Icinga\Authentication\Auth;
 use Icinga\Data\Filter\Filter;
 use Icinga\Exception\IcingaException;
 use Icinga\Module\Director\Db;
+use Icinga\Module\Director\Db\DbSelectParenthesis;
 use Icinga\Module\Director\Db\DbUtil;
 use Icinga\Module\Director\Db\IcingaObjectFilterHelper;
 use Icinga\Module\Director\IcingaConfig\AssignRenderer;
@@ -20,6 +21,8 @@ use Zend_Db_Select as ZfSelect;
 
 class ApplyRulesTable extends ZfQueryBasedTable
 {
+    use TableWithBranchSupport;
+
     protected $searchColumns = [
         'o.object_name',
         'o.assign_filter',
@@ -94,10 +97,14 @@ class ApplyRulesTable extends ZfQueryBasedTable
             // NOT (YET) static::td($this->createActionLinks($row))->setSeparator(' ')
         ]);
 
+        $classes = $this->getRowClasses($row);
+
         if ($row->disabled === 'y') {
-            $tr->getAttributes()->add('class', 'disabled');
+            $classes[] = 'disabled';
         }
 
+        $tr->getAttributes()->add('class', $classes);
+
         return $tr;
     }
 
@@ -117,7 +124,8 @@ class ApplyRulesTable extends ZfQueryBasedTable
             $this->getQuery(),
             $template,
             'o',
-            $inheritance
+            $inheritance,
+            $this->branchUuid
         );
 
         return $this;
@@ -146,7 +154,7 @@ class ApplyRulesTable extends ZfQueryBasedTable
         $links = [];
         $links[] = Link::create(
             Icon::create('sitemap'),
-            "${baseUrl}template/applytargets",
+            "{$baseUrl}template/applytargets",
             ['id' => $row->id],
             ['title' => $this->translate('Show affected Objects')]
         );
@@ -196,6 +204,15 @@ class ApplyRulesTable extends ZfQueryBasedTable
         return FilterRenderer::applyToQuery($filter, $query);
     }
 
+    protected function getRowClasses($row)
+    {
+        // TODO: remove isset, to figure out where it is missing
+        if (isset($row->branch_uuid) && $row->branch_uuid !== null) {
+            return ['branch_modified'];
+        }
+        return [];
+    }
+
 
     /**
      * @return IcingaObject
@@ -216,6 +233,7 @@ class ApplyRulesTable extends ZfQueryBasedTable
             'id'            => 'o.id',
             'uuid'          => 'o.uuid',
             'object_name'   => 'o.object_name',
+            'object_type'   => 'o.object_type',
             'disabled'      => 'o.disabled',
             'assign_filter' => 'o.assign_filter',
             'apply_for'     => '(NULL)',
@@ -224,17 +242,92 @@ class ApplyRulesTable extends ZfQueryBasedTable
         if ($table === 'icinga_service') {
             $columns['apply_for'] = 'o.apply_for';
         }
+
+        $conn = $this->connection();
         $query = $this->db()->select()->from(
             ['o' => $table],
             $columns
-        )->where(
-            "object_type = 'apply'"
         )->order('o.object_name');
 
-        if ($this->type === 'service') {
-            $query->where('service_set_id IS NULL');
+        if ($this->branchUuid) {
+            $columns = $this->branchifyColumns($columns);
+            $columns['branch_uuid'] = 'bo.branch_uuid';
+            if ($conn->isPgsql()) {
+                $columns['imports'] = 'CONCAT(\'[\', ARRAY_TO_STRING(ARRAY_AGG'
+                    . '(CONCAT(\'"\', sub_o.object_name, \'"\')), \',\'), \']\')';
+            } else {
+                $columns['imports'] = 'CONCAT(\'[\', '
+                    . 'GROUP_CONCAT(CONCAT(\'"\', sub_o.object_name, \'"\')), \']\')';
+            }
+
+            $this->stripSearchColumnAliases();
+
+            $query->reset('columns');
+            $right = clone($query);
+
+            $query->columns($columns)
+                ->joinLeft(
+                    ['oi' => $table . '_inheritance'],
+                    'o.id = oi.' . $this->getType() . '_id',
+                    []
+                )->joinLeft(
+                    ['sub_o' => $table],
+                    'sub_o.id = oi.parent_' . $this->getType() . '_id',
+                    []
+                )->group(['o.id', 'bo.uuid', 'bo.branch_uuid']);
+
+            $query->joinLeft(
+                ['bo' => "branched_$table"],
+                // TODO: PgHexFunc
+                $this->db()->quoteInto(
+                    'bo.uuid = o.uuid AND bo.branch_uuid = ?',
+                    DbUtil::quoteBinaryLegacy($this->branchUuid->getBytes(), $this->db())
+                ),
+                []
+            )->where("(bo.branch_deleted IS NULL OR bo.branch_deleted = 'n')");
+
+            if ($this->type === 'service') {
+                $query->where('o.service_set_id IS NULL AND bo.service_set IS NULL');
+            }
+
+            $columns['imports'] = 'bo.imports';
+
+            $right->columns($columns)
+                ->joinRight(
+                    ['bo' => "branched_$table"],
+                    'bo.uuid = o.uuid',
+                    []
+                )
+                ->where('o.uuid IS NULL')
+                ->where('bo.branch_uuid = ?', $conn->quoteBinary($this->branchUuid->getBytes()));
+
+            $query = $this->db()->select()->union([
+                'l' => new DbSelectParenthesis($query),
+                'r' => new DbSelectParenthesis($right),
+            ]);
+
+            $query = $this->db()->select()->from(['u' => $query]);
+            $query->order('object_name')->limit(100);
+        } else {
+            if ($this->type === 'service') {
+                $query->where('service_set_id IS NULL');
+            }
         }
 
+        $query->where(
+            "object_type = 'apply'"
+        );
+
+        $this->applyRestrictions($query);
+
         return $this->applyRestrictions($query);
     }
+
+    /**
+     * @return Db
+     */
+    public function connection()
+    {
+        return parent::connection();
+    }
 }