Merge pull request django-cms#4689 from mkoistinen/fix_edit_mode

Use edit_mode constant

Author: mkoistinen

cms/tests/test_wizards.py

@@ -113,12 +113,12 @@ def test_get_success_url(self):
             in_navigation=True,
             published=False
         )
-        url = "{0}?edit=".format(page.get_absolute_url(language="en"))
+        url = "{0}?edit".format(page.get_absolute_url(language="en"))
         self.assertEqual(self.page_wizard.get_success_url(
             page, language="en"), url)
 
         # Now again without a language code
-        url = "{0}?edit=".format(page.get_absolute_url())
+        url = "{0}?edit".format(page.get_absolute_url())
         self.assertEqual(self.page_wizard.get_success_url(page), url)
 
     def test_get_model(self):

cms/wizards/wizard_base.py

@@ -2,23 +2,18 @@
 
 import hashlib
 
-try:
-    from urllib.parse import urlunparse  # Py3
-except ImportError:
-    from urlparse import urlunparse  # Py2
-
 from django.core.exceptions import ImproperlyConfigured
 from django.forms.models import ModelForm
-from django.http import QueryDict
 from django.utils.encoding import python_2_unicode_compatible
-from django.utils.six.moves.urllib.parse import urlparse as six_urlparse
 
 from django.utils.translation import (
     override as force_language,
     force_text,
     ugettext as _
 )
 
+from cms.utils import get_cms_setting
+
 
 class WizardBase(object):
     template_name = None
@@ -125,12 +120,9 @@ def get_success_url(self, obj, **kwargs):
 
         # Add 'edit' to GET params of URL
         if self.edit_mode_on_success:
-            (scheme, netloc, path, params, query, fragment) = six_urlparse(url)
-            query_dict = QueryDict(query).copy()
-            query_dict['edit'] = ''
-            query = query_dict.urlencode()
-            url = urlunparse((scheme, netloc, path, params, query, fragment))
-
+            sep = "&" if "?" in url else "?"
+            url = '{0}{1}{2}'.format(
+                url, sep, get_cms_setting('CMS_TOOLBAR_URL__EDIT_ON'))
         return url
 
     def get_model(self):