From 290e34a8ca87e5573b38e97ec25fcbd23c3fa84d Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Mon, 23 Aug 2021 09:00:26 +0200
Subject: [PATCH] ObjectsTable: add branchUuid, fail-safe

---
 library/Director/Web/Table/ObjectsTable.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/library/Director/Web/Table/ObjectsTable.php b/library/Director/Web/Table/ObjectsTable.php
index 5712916d..f5ee1cad 100644
--- a/library/Director/Web/Table/ObjectsTable.php
+++ b/library/Director/Web/Table/ObjectsTable.php
@@ -185,6 +185,10 @@ class ObjectsTable extends ZfQueryBasedTable
 
     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 [];
     }
 
@@ -269,6 +273,10 @@ class ObjectsTable extends ZfQueryBasedTable
     protected function prepareQuery()
     {
         $table = $this->getDummyObject()->getTableName();
+        if ($this->branchUuid) {
+            $this->columns['branch_uuid'] = 'bo.branch_uuid';
+        }
+
         $columns = $this->getColumns();
         if ($this->branchUuid) {
             $columns = $this->branchifyColumns($columns);