Fixed #6296 -- Removed localization for pk values in toolbar js (#6294)

Conflicts: CHANGELOG.txt cms/templates/cms/toolbar/toolbar_javascript.html
django-cms · Jul 3, 2018 · fb6d4e0 · fb6d4e0
1 parent f292f8a
commit fb6d4e0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -4,6 +4,8 @@
 * Fixed a bug where xframe options were processed by clickjacking middleware
   when page was served from cache, rather then get this value from cache
 * Fixed a bug where cached page permissions overrides global permissions
+* Fixed a bug where editing pages with primary keys greater than 9999 would throw an
+  exception.
 
 
 === 3.4.6 (2018-03-26) ===

diff --git a/cms/templates/cms/toolbar/toolbar_javascript.html b/cms/templates/cms/toolbar/toolbar_javascript.html
@@ -16,8 +16,8 @@
     'request': {
         'language': '{{ request.GET.language|escape|escapejs }}',
         'model': '{{ request.toolbar.get_object_model }}',
-        'page_id': '{% if request.current_page.publisher_is_draft %}{{ request.current_page.pk }}{% else %}{{ request.current_page.publisher_public_id }}{% endif %}',
-        'pk': '{{ request.toolbar.get_object_pk }}',
+        'page_id': '{% if request.current_page.publisher_is_draft %}{{ request.current_page.pk|unlocalize }}{% else %}{{ request.current_page.publisher_public_id|unlocalize }}{% endif %}',
+        'pk': '{{ request.toolbar.get_object_pk|unlocalize }}',
         'url': '{% language request.toolbar.language %}{% cms_admin_url "cms_page_resolve" %}{% endlanguage %}',
         'tree': '{% language request.toolbar.language %}{% cms_admin_url "cms_page_changelist" %}{% endlanguage %}'
     },