Merge pull request #333 from xibosignage/develop

1.8.7 testing - build master container
xibosignage · Feb 26, 2018 · c3327db · c3327db
2 parents 51dc129 + b4c3f07
commit c3327db
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/lib/Controller/DayPart.php b/lib/Controller/DayPart.php
@@ -141,11 +141,12 @@ public function grid()
         ];
 
         $dayParts = $this->dayPartFactory->query($this->gridRenderSort(), $this->gridRenderFilter($filter));
-
+        $embed = ($this->getSanitizer()->getString('embed') != null) ? explode(',', $this->getSanitizer()->getString('embed')) : [];
+
         foreach ($dayParts as $dayPart) {
             /* @var \Xibo\Entity\DayPart $dayPart */
-            if (in_array('exceptions', $embed)){
-                $dayPart->load();
+            if (!in_array('exceptions', $embed)){
+                $dayPart->excludeProperty('exceptions');
             }
             if ($this->isApi())
                 break;