From ee4df36735e57ee23789c26613a3f200bdebb38a Mon Sep 17 00:00:00 2001
From: Kevin Papst <kevinpapst@users.noreply.github.com>
Date: Sun, 2 Sep 2018 20:58:19 +0200
Subject: [PATCH] allow to switch language on any page (#299)

---
 composer.json                        |  2 +-
 composer.lock                        | 17 ++++++++--------
 src/Controller/SidebarController.php | 30 +++++-----------------------
 templates/sidebar/settings.html.twig |  8 +-------
 4 files changed, 16 insertions(+), 41 deletions(-)

diff --git a/composer.json b/composer.json
index 028241c0..c3ef6ce2 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
         "friendsofsymfony/rest-bundle": "^2.3",
         "friendsofsymfony/user-bundle": "~2.0",
         "jms/serializer-bundle": "^2.4",
-        "kevinpapst/adminlte-bundle": "^2.0",
+        "kevinpapst/adminlte-bundle": "^2.1",
         "nelmio/api-doc-bundle": "^3.2",
         "ocramius/proxy-manager": "2.1.1",
         "sensio/framework-extra-bundle": "^5.2",
diff --git a/composer.lock b/composer.lock
index 8f8e4508..6f7720ed 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "0cf38f9b4970d089487593f344ed0282",
+    "content-hash": "26a66efe4ec32d6644deeaff090a303b",
     "packages": [
         {
             "name": "beberlei/DoctrineExtensions",
@@ -1840,16 +1840,16 @@
         },
         {
             "name": "kevinpapst/adminlte-bundle",
-            "version": "2.0",
+            "version": "2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/kevinpapst/AdminLTEBundle.git",
-                "reference": "ee9406d2fc60a4d26d317fe555104df803ca130c"
+                "reference": "43840776d45cb86a4dbcb915efa582eb41c5a564"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kevinpapst/AdminLTEBundle/zipball/ee9406d2fc60a4d26d317fe555104df803ca130c",
-                "reference": "ee9406d2fc60a4d26d317fe555104df803ca130c",
+                "url": "https://api.github.com/repos/kevinpapst/AdminLTEBundle/zipball/43840776d45cb86a4dbcb915efa582eb41c5a564",
+                "reference": "43840776d45cb86a4dbcb915efa582eb41c5a564",
                 "shasum": ""
             },
             "require": {
@@ -1865,7 +1865,8 @@
             },
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "^2.10",
-                "phpspec/prophecy": "^1.6"
+                "phpspec/prophecy": "^1.6",
+                "phpunit/phpunit": "^7.3"
             },
             "suggest": {
                 "friendsofsymfony/user-bundle": "Allows easy user management and security support",
@@ -1895,8 +1896,8 @@
                     "homepage": "https://www.kevinpapst.de"
                 }
             ],
-            "description": "Admin Theme based on the AdminLTE 2.3 for easy integration with Symfony 4",
-            "time": "2018-08-15T21:18:05+00:00"
+            "description": "Admin Theme based on the AdminLTE 2.4.8 for easy integration with Symfony 4",
+            "time": "2018-09-02T17:21:38+00:00"
         },
         {
             "name": "monolog/monolog",
diff --git a/src/Controller/SidebarController.php b/src/Controller/SidebarController.php
index e0dc0b64..ece50a49 100644
--- a/src/Controller/SidebarController.php
+++ b/src/Controller/SidebarController.php
@@ -9,8 +9,8 @@
 
 namespace App\Controller;
 
-use App\Form\UserPreferencesForm;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Sidebar controller
@@ -20,34 +20,14 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 class SidebarController extends AbstractController
 {
     /**
+     * @param Request $originalRequest
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function homeAction()
+    public function settingsAction(Request $originalRequest)
     {
-        return $this->render('sidebar/home.html.twig', []);
-    }
-
-    /**
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function settingsAction()
-    {
-        $user = $this->getUser();
-
         return $this->render('sidebar/settings.html.twig', [
-            'user' => $user,
+            'user' => $this->getUser(),
+            'originalRequest' => $originalRequest,
         ]);
-
-        /*
-
-        $form = $this->createForm(UserPreferencesForm::class, $user, [
-            'action' => $this->generateUrl('user_profile_preferences', ['username' => $user->getUsername()]),
-            'method' => 'POST',
-        ]);
-
-        return $this->render('sidebar/settings.html.twig', [
-            'form' => $form->createView(),
-        ]);
-        */
     }
 }
diff --git a/templates/sidebar/settings.html.twig b/templates/sidebar/settings.html.twig
index 01d83c44..ba3c48b8 100644
--- a/templates/sidebar/settings.html.twig
+++ b/templates/sidebar/settings.html.twig
@@ -23,14 +23,8 @@
         {{ 'preferences.label.language'|trans({}, 'sidebar') }}
         <select class="pull-right" onchange="window.location.href = this.options[this.selectedIndex].value;">
             {% for locale in locales() %}
-                <option value="{{ path(app.request.get('_route', 'homepage'), app.request.get('_route_params', [])|merge({ _locale: locale.code })) }}" {% if app.request.locale == locale.code %}selected="selected"{% endif %}>{{ locale.name|capitalize }}</option>
+                <option value="{{ path(originalRequest.get('_route', 'homepage'), originalRequest.get('_route_params', [])|merge({ _locale: locale.code })) }}" {% if app.request.locale == locale.code %}selected="selected"{% endif %}>{{ locale.name|capitalize }}</option>
             {% endfor %}
         </select>
     </label>
 </div>
-{#
-{{ form_start(form) }}
-{{ form_widget(form) }}
-<input type="submit" value="{{ 'action.save'|trans }}" class="btn btn-primary" />
-{{ form_end(form) }}
-#}
\ No newline at end of file