Merge pull request #6795 from akeneo/PIM-6643

PIM-6643: Fix navigation bug after logout
akeneo · Sep 25, 2017 · e99e492 · e99e492
2 parents 365bf39 + a03e482
commit e99e492
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/src/Pim/Bundle/EnrichBundle/Resources/config/requirejs.yml b/src/Pim/Bundle/EnrichBundle/Resources/config/requirejs.yml
@@ -436,6 +436,8 @@ config:
                     aclResourceId: pim_enrich_api_connection_manage
                     config:
                         entity: api-connection
+                oro_user_security_logout:
+                    module: pim/controller/logout
         pim/attribute-edit-form/type-specific-form-registry:
             formNames:
                 pim_catalog_date:
@@ -513,6 +515,7 @@ config:
         pim/controller/attribute/edit:         pimenrich/js/controller/attribute/edit
         pim/controller/attribute/create:       pimenrich/js/controller/attribute/create
         pim/controller/mass-edit:              pimenrich/js/controller/mass-edit
+        pim/controller/logout:                 pimenrich/js/controller/logout
 
         jquery.wizard:                      pimenrich/js/jquery.wizard
         jstree/jquery.jstree.tree_selector: pimenrich/js/jstree/jquery.jstree.tree_selector

diff --git a/src/Pim/Bundle/EnrichBundle/Resources/public/js/controller/logout.js b/src/Pim/Bundle/EnrichBundle/Resources/public/js/controller/logout.js
@@ -0,0 +1,17 @@
+'use strict';
+
+define(
+    ['jquery', 'underscore', 'pim/controller/base', 'pim/router'],
+    function ($, _, BaseController, router) {
+        return BaseController.extend({
+            /**
+             * {@inheritdoc}
+             */
+            renderRoute: function (route, path) {
+                return $.get(path).then(() => {
+                    window.location = router.generate('oro_user_security_login');
+                }).promise();
+            }
+        });
+    }
+);