Updated cms_path with page querystring (#5822)

django-cms · Dec 27, 2016 · 865087b · 865087b
1 parent 4b8089b
commit 865087b
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 12 deletions.
diff --git a/cms/static/cms/js/dist/3.4.1/bundle.admin.base.min.js b/cms/static/cms/js/dist/3.4.1/bundle.admin.base.min.js
diff --git a/cms/static/cms/js/dist/3.4.1/bundle.toolbar.min.js b/cms/static/cms/js/dist/3.4.1/bundle.toolbar.min.js
diff --git a/cms/static/cms/js/modules/cms.base.js b/cms/static/cms/js/modules/cms.base.js
@@ -619,7 +619,8 @@ CMS.API.Helpers = {
      * @returns {String} modified url
      */
     updateUrlWithPath: function (url) {
-        var path = window.location.pathname;
+        var win = this._getWindow();
+        var path = win.location.pathname + win.location.search;
 
         return this.makeURL(url, ['cms_path=' + encodeURIComponent(path)]);
     }

diff --git a/cms/tests/frontend/unit/cms.base.test.js b/cms/tests/frontend/unit/cms.base.test.js
@@ -1102,5 +1102,19 @@ describe('cms.base.js', function () {
                 expect(CMS.API.Helpers._getWindow()).toEqual(window);
             });
         });
+
+        describe('.updateUrlWithPath()', function () {
+            it('supports query strings', function () {
+                spyOn(CMS.API.Helpers, '_getWindow').and.returnValue({
+                    location: {
+                        pathname: '/de/',
+                        search: '?language=en'
+                    }
+                });
+
+                expect(CMS.API.Helpers.updateUrlWithPath('/'))
+                    .toEqual('/?cms_path=%2Fde%2F%3Flanguage%3Den');
+            });
+        });
     });
 });
diff --git a/cms/tests/frontend/unit/cms.toolbar.test.js b/cms/tests/frontend/unit/cms.toolbar.test.js
@@ -903,7 +903,9 @@ describe('CMS.Toolbar', function () {
             });
             fakeWindow = {
                 location: {
-                    href: ''
+                    href: '',
+                    pathname: '/context.html',
+                    search: ''
                 }
             };
             spyOn(CMS.Navigation.prototype, 'initialize').and.callFake(function () {