Merge branch 'master' of https://github.com/arrilot/bitrix-models

arrilot · May 10, 2018 · 5eb4b01 · 5eb4b01
2 parents 844c583 + b77d10d
commit 5eb4b01
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -510,7 +510,7 @@ class Product extends ElementModel
 
     public function questions()
     {
-        return $this->hasMany(ProductQuestion::class, 'ID', PROPERTY_PRODUCT_VALUE');
+        return $this->hasMany(ProductQuestion::class, 'ID', 'PROPERTY_PRODUCT_VALUE');
     }
 }
 ```

diff --git a/src/Queries/BaseQuery.php b/src/Queries/BaseQuery.php
@@ -101,14 +101,14 @@ abstract public function count();
      */
     public function getList()
     {
-        if ($this->queryShouldBeStopped) {
-            return new Collection();
-        }
-
         if (!is_null($this->primaryModel)) {
             // Запрос - подгрузка релейшена. Надо добавить filter
             $this->filterByModels([$this->primaryModel]);
         }
+
+        if ($this->queryShouldBeStopped) {
+            return new Collection();
+        }
 
         $models = $this->loadModels();