Merge pull request #6055 from vxsx/feature/follow-redirect

Added code to handle FOLLOW_REDIRECT
django-cms · Aug 25, 2017 · d416cf1 · d416cf1
2 parents 7f44887 + ee51877
commit d416cf1
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/cms/constants.py b/cms/constants.py
@@ -2,6 +2,7 @@
 
 TEMPLATE_INHERITANCE_MAGIC = 'INHERIT'
 REFRESH_PAGE = 'REFRESH_PAGE'
+FOLLOW_REDIRECT = 'FOLLOW_REDIRECT'
 URL_CHANGE = 'URL_CHANGE'
 RIGHT = object() # this is a trick so "foo is RIGHT" will only ever work for this, same goes for LEFT.
 LEFT = object()

diff --git a/cms/static/cms/js/dist/3.4.3/bundle.toolbar.min.js b/cms/static/cms/js/dist/3.4.3/bundle.toolbar.min.js
diff --git a/cms/static/cms/js/modules/cms.toolbar.js b/cms/static/cms/js/modules/cms.toolbar.js
@@ -569,7 +569,11 @@ var Toolbar = new Class({
                     callback(that, response);
                     that.hideLoader();
                 } else if (onSuccess) {
-                    Helpers.reloadBrowser(onSuccess, false, true);
+                    if (onSuccess === 'FOLLOW_REDIRECT') {
+                        Helpers.reloadBrowser(response.url);
+                    } else {
+                        Helpers.reloadBrowser(onSuccess, false, true);
+                    }
                 } else {
                     // reload
                     Helpers.reloadBrowser(false, false, true);

diff --git a/cms/tests/frontend/unit/cms.toolbar.test.js b/cms/tests/frontend/unit/cms.toolbar.test.js
@@ -206,6 +206,26 @@ describe('CMS.Toolbar', function () {
             expect(toolbar.hideLoader).not.toHaveBeenCalled();
         });
 
+        it('uses custom onSuccess url from request success', function () {
+            spyOn($, 'ajax').and.callFake(function () {
+                return {
+                    done: function (callback) {
+                        callback({ url: '/redirect-url' });
+                        return { fail: $.noop };
+                    }
+                };
+            });
+
+            spyOn(CMS.API.Helpers, 'reloadBrowser');
+
+            toolbar.openAjax({
+                url: '/url',
+                onSuccess: 'FOLLOW_REDIRECT'
+            });
+
+            expect(CMS.API.Helpers.reloadBrowser).toHaveBeenCalledWith('/redirect-url');
+        });
+
         it('uses custom onSuccess url after request succeeds', function () {
             spyOn($, 'ajax').and.callFake(function () {
                 return {