Merge pull request #18 from sl0wik/bugfix/component_and_menu_fix

Bugfix: component and menu fix
sl0wik · Mar 24, 2018 · b506776 · b506776
2 parents 1e2c235 + 75417e5
commit b506776
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/Models/Content.php b/src/Models/Content.php
@@ -137,6 +137,7 @@ public function getComponents($name = null)
 
         return $query->get()->map(function ($componentPayload) {
             $output = $componentPayload->payload;
+            $output->component_name = $componentPayload->component->name;
 
             if ($componentPayload->component->custom('gallery')) {
                 $images = Image::where([['parent_type', 'component-payloads'], ['parent_id', $componentPayload->id]])->get();

diff --git a/src/Models/Menu.php b/src/Models/Menu.php
@@ -22,6 +22,7 @@ public static function generate($name)
         $fields = ['url_path', 'id', 'parent_id', 'head_title', 'menu_title', 'website_id', 'status'];
 
         $content = self::where('name', $name)
+            ->where('website_id', env('WEBSITE_ID'))
             ->with('contents')
             ->first()
             ->contents()