Skip to content

Commit

Permalink
fix: Use http rather than https in toolbar sites menu (#7331)
Browse files Browse the repository at this point in the history
  • Loading branch information
marksweb committed Jun 1, 2022
1 parent 3db198c commit a91ac91
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 13 deletions.
22 changes: 10 additions & 12 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Changelog
=========

3.10.1 (2022-06-01)
3.10.1 (2022-06-02)
===================

Bug Fixes:
Expand All @@ -11,6 +11,7 @@ Bug Fixes:
* Fix for django 2.2 in middleware [#7290] (#7293) -- Mark Walker
* Update release script to start bringing support for macOS (#7294) -- Mark Walker
* Fix release script version commit. (#7295) -- Mark Walker
* Revert change to the toolbar sites menu to use ``http`` protocol. (#7331) -- Mark Walker

Statistics:
-----------
Expand All @@ -20,10 +21,7 @@ This release includes 8 pull requests, and was created with the help of the foll
* Conrad (3 pull requests)
* Florian Delizy (1 pull request)
* Marco Bonetti (1 pull request)
* Mark Walker (3 pull requests)

With the review help of the following contributors:

* Mark Walker (4 pull requests)

Thanks to all contributors for their efforts!

Expand Down Expand Up @@ -139,7 +137,7 @@ Bug Fixes:
* Fix styles issues, caused by switching to the ``display: flex`` on the page tree renderer.
* Fixed missing builtin arguments on main ``cms`` management command causing it to crash
* Fixed template label nested translation
* Fixed a bug where the fallback page title whould be returned instead of the one from the current language
* Fixed a bug where the fallback page title would be returned instead of the one from the current language
* Fixed an issue when running migrations on a multi database project
* Fixes #7033: also check for Django 3.2, now that 3.9 supports it. (#7054) (02083f2dc) -- Marco Bonetti

Expand Down Expand Up @@ -240,7 +238,7 @@ Thanks to all contributors for their efforts!
* Fixed an issue in ``wizards/create.html`` where the error message did not use the plural form
* Improved documentation building
* Updated the content for django CMS’s development community
* Replaced all occurences of ``force_text`` and ``smart_text`` against
* Replaced all occurrences of ``force_text`` and ``smart_text`` against
``force_str``and ``smart_str``.


Expand Down Expand Up @@ -778,7 +776,7 @@ Thanks to all contributors for their efforts!
- Substantial improvements to the page tree and significant reduction of reloads
- Update jsTree version to 3.2.1 with slight adaptions to the Pagetree
- Documentation improvements
- Improve the display and useability of the language menu, especially in cases
- Improve the display and usability of the language menu, especially in cases
where there are many languages.
- Fix an issue relating to search fields in plugins
- Fix an issue where the app-resolver would trigger locales into migrations
Expand Down Expand Up @@ -1092,7 +1090,7 @@ Thanks to all contributors for their efforts!
- Improves redirection as a result of changes to page slugs, etc.
- Improves performance of "watched models"
- Improves frontend performance relating to resizing the sideframe
- Corrects an issue where items might not be visible in structue mode menus
- Corrects an issue where items might not be visible in structure mode menus
- Limits version of django-mptt used in CMS for 3.0.x
- Prevent accidental upgrades to Django 1.8, which is not yet supported

Expand Down Expand Up @@ -1149,7 +1147,7 @@ Thanks to all contributors for their efforts!
==================

- Add require_parent option to CMS_PLACEHOLDER_CONF
- Fix django-mptt version depenency to be PEP440 compatible
- Fix django-mptt version dependency to be PEP440 compatible
- Fix some Django 1.4 compatibility issues
- Add toolbar sanity check
- Fix behavior with CMSPluginBase.get_render_template()
Expand Down Expand Up @@ -1177,7 +1175,7 @@ Thanks to all contributors for their efforts!
- Fixes PageField to work in Django 1.7 environments
- Updates to community and project governance documentation
- Added list of retired core developers
- Added branch policy documentaion
- Added branch policy documentation


3.0.6 (2014-10-07)
Expand Down Expand Up @@ -1387,7 +1385,7 @@ Please see Install/2.4 release notes *before* attempting to upgrade to version 2
- CMS_FRONTEND_LANGUAGES limits django languages as well during language selection
- Wymeditor updated to 1.0.4a
- icon_url escape fixed
- Ukranian translation added
- Ukrainian translation added
- Fixed wrong language prefix handling for form actions and admin preview
- Admin icons in django 1.4 fixed
- Added requirements.txt for pip and testing in test_requirements
Expand Down
2 changes: 1 addition & 1 deletion cms/cms_toolbars.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ def add_admin_menu(self):
sites_menu.add_sideframe_item(_('Admin Sites'), url=admin_reverse('sites_site_changelist'))
sites_menu.add_break(ADMIN_SITES_BREAK)
for site in sites_queryset:
sites_menu.add_link_item(site.name, url='https://%s' % site.domain,
sites_menu.add_link_item(site.name, url='http://%s' % site.domain,
active=site.pk == self.current_site.pk)

# admin
Expand Down

0 comments on commit a91ac91

Please sign in to comment.