Merge pull request #216 from systeminc/maki10-patch-1

Maki10 patch 1

Author: maki10

src/Gallery.php

@@ -16,7 +16,7 @@ class Gallery extends Model
 
     public function images()
     {
-        return $this->hasMany('SystemInc\LaravelAdmin\GalleryImage')->orderBy('order_number');
+        return $this->hasMany('SystemInc\LaravelAdmin\GalleryImage')->orderBy('order_number')->with('elements');
     }
 
     public function product()

src/GalleryImage.php

@@ -36,6 +36,11 @@ public function getAllElements()
         return $this->hasMany(GalleryElement::class, 'image_id');
     }
 
+    public function elements()
+    {
+        return $this->getAllElements();
+    }
+
     public function gallery()
     {
         return $this->belongsTo(Gallery::class);

src/SLA.php

@@ -35,9 +35,9 @@ public function shop()
     public function page($page_query = null)
     {
         if (is_string($page_query)) {
-            return Page::where(['slug' => $page_query])->first();
+            return Page::where(['slug' => $page_query])->with('elements')->first();
         } elseif (is_int($page_query)) {
-            return Page::where(['id' => $page_query])->first();
+            return Page::where(['id' => $page_query])->with('elements')->first();
         }
 
         return new Page();
@@ -63,7 +63,7 @@ public function element($key)
     public function gallery($key = false)
     {
         if ($key) {
-            return Gallery::where(['key' => $key])->first();
+            return Gallery::where(['key' => $key])->with('images')->first();
         }
 
         return new Gallery();