Set QueryInclude to be ignored in auto population.

Ex. for custom includes handled in Model postRestGet.

Author: Martin-4Spaces

Includes/QueryInclude.php

@@ -13,6 +13,8 @@
  */
 class QueryInclude {
 
+    public $ignoreAuto = false;
+
     public static function parse($line) {
         $item = new QueryInclude();
 
@@ -27,4 +29,4 @@ public static function parse($line) {
         return $item;
     }
 
-}
+}

ResourceModelTrait.php

@@ -31,7 +31,9 @@ public function restGet($id, $queryParser) {
 
                 $this->preRestGet($queryParser, $id);
 
-                foreach($queryParser->getIncludes() as $include) $this->applyIncludeOne($include);
+                foreach($queryParser->getIncludes() as $include) {
+                    if(!$include->ignoreAuto) $this->applyIncludeOne($include);
+                }
                 foreach($queryParser->getFilters() as $filter) $this->applyFilter($filter);
                 $searchFilters = $queryParser->getSearchFilters();
                 if(count($searchFilters)) {
@@ -60,10 +62,14 @@ public function restGet($id, $queryParser) {
                 if($items->exists()) {
                     if($id) {
                         $item = $items->first();
-                        foreach($queryParser->getIncludes() as $include) $this->applyIncludeMany($items, $include);
+                        foreach($queryParser->getIncludes() as $include) {
+                            if(!$include->ignoreAuto) $this->applyIncludeMany($items, $include);
+                        }
                         $this->applyRestGetOneRelations($item);
                     } else {
-                        foreach($queryParser->getIncludes() as $include) $this->applyIncludeMany($items, $include);
+                        foreach($queryParser->getIncludes() as $include) {
+                            if(!$include->ignoreAuto) $this->applyIncludeMany($items, $include);
+                        }
                         $this->appleRestGetManyRelations($items);
                     }