wip #3294 @0.5

diff --git a/app/Templates/Solution.php b/app/Templates/Solution.php
index d565b97627d10294845cdd8da5e6af36ac496c9a..a6ed62d29a5c678701554b8de4eaccb0c03a9bc5 100644 (file)
--- a/app/Templates/Solution.php
+++ b/app/Templates/Solution.php
@@ -10,8 +10,6 @@ use Cubist\Backpack\app\Magic\PageData;
 
 class Solution extends Base
 {
-    protected static $_menuChildrenDone = false;
-
     public function getName()
     {
         return 'Solution';
@@ -33,18 +31,20 @@ class Solution extends Base
 
     public function setMenuChildren($menu)
     {
-        if (self::$_menuChildrenDone) {
-            return;
-        }
-
-        self::$_menuChildrenDone = true;
-
         Debugbar::startMeasure('nav_applications', 'Make applications nav items');
         parent::setMenuChildren($menu);
 
         $applications = Application::all();
 
+        $solution_apps = $menu->getPageData()->get('applications');
+        if (null === $solution_apps || !$solution_apps) {
+            return;
+        }
+
         foreach ($applications as $application) {
+            if (!in_array($application->id, $solution_apps)) {
+                continue;
+            }
             $item = new PageItem();
             $item->initFromEntity($application);
             $item->setTitle($application->title);

diff --git a/resources/views/partials/footer-language-switcher.blade.php b/resources/views/partials/footer-language-switcher.blade.php
index 0560df3becaa261a10448cbc81982b9ccb04479d..d437cba0b9c21338d29da822b2cffed00a4877c2 100644 (file)
--- a/resources/views/partials/footer-language-switcher.blade.php
+++ b/resources/views/partials/footer-language-switcher.blade.php
@@ -11,9 +11,6 @@
                 @foreach($locales['others'] as $code=>$locale)
                     @php
                         $alternate=CubistMenu::getCurrentPage()->getTranslatedPage($code,false);
-                        if(null===$alternate){
-
-                        }
                     @endphp
                     <li><a href="{{$alternate->getURL()}}"
                            target="_self"><img src="{{ asset('images/locale-'.$locale['flag'].'.svg') }}"