8000 Fixed a bug due to incorrect localization in toolbar JS by rfleschenberg · Pull Request #6294 · django-cms/django-cms · GitHub
[go: up one dir, main page]
Skip to content

Fixed a bug due to incorrect localization in toolbar JS #6294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 5, 2018
Merged

Fixed a bug due to incorrect localization in toolbar JS #6294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
=== 3.5.1 (unreleased) ===

* Fixed a bug where editing pages with primary keys greater than 9999 would throw an
exception.
* Fixed a ``MultipleObjectsReturned`` exception raised on the page types migration
with multiple page types per site.
* Fixed a bug which prevented toolbar js from working correctly when rendered
Expand Down
4 changes: 2 additions & 2 deletions cms/templates/cms/toolbar/toolbar_javascript.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
'request': {
'language': '{{ cms_toolbar.language }}',
'model': '{{ cms_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': '{{ cms_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': '{{ cms_toolbar.get_object_pk|unlocalize }}',
'url': '{% language cms_toolbar.language %}{% cms_admin_url "cms_page_resolve" %}{% endlanguage %}',
'toolbar': '{% language cms_toolbar.language %}{% cms_admin_url "cms_usersettings_get_toolbar" %}{% endlanguage %}'
},
Expand Down
0