8000 ci: Sync release/3.10.x with develop (#7328) · django-cms/django-cms@994f928 · GitHub
[go: up one dir, main page]
Skip to content

Commit 994f928

Browse files
markswebFlorian DelizyvinitkumarSimon Krullfsbraun
authored
ci: Sync release/3.10.x with develop (#7328)
* Release 3.10.0 RC1 (#7215) * [3.10.0rc1 release process] Bumped version to 3.10.0rc1 * [3.10.0rc1 release process] compilemessages * [3.10.0rc1 release process] compiling new static files * [3.10.0rc1 release process] updating latest docs * Update release/3.10 from develop (#7219) * Fix script typos (#7201) * [refactor] Typos in release scripts * This was correct. Co-authored-by: Simon Krull <simondotunix@gmail.com> * feat: Added concurrency option to github workflows (#7205) * fix: Disable workflow concurrency to bring stability back to the CI (#7209) * Upgrade Gulp and Nodejs (#7208) * feat: upgrade sass and gulp sass so that it installs on a modern node.js * fix: upgrade some packages and gulp config to 4.x series * fix: add support for icons working as well * Feat: get some tasks to work * fix: port one more tasks even if it is still erroring * wip: still broken config for webpack bundle * fix: let the new tests run * fix: issue with lint task * fix: some more issues with loaders * feat: get some tests passing atleast * fix: the frontend tests pass now * feat: generate new lock file * feat: use gulp 4.x * feat: make build use node16 as well * feat: add .nvmrc for a consistent experience * feat: Run workflows in concurrency groups (#7211) * feat: Added concurrency config using unique workflow groups * Remove whitespace to test cancellation * Remove whitespace to test cancellation 2 Co-authored-by: Vinit Kumar <mail@vinitkumar.me> Co-authored-by: Simon Krull <simondotunix@gmail.com> * Add toolbar fix for broken CMS in the release 3.10.x (#7233) * Fix script typos (#7201) * [refactor] Typos in release scripts * This was correct. Co-authored-by: Simon Krull <simondotunix@gmail.com> * feat: Added concurrency option to github workflows (#7205) * fix: Disable workflow concurrency to bring stability back to the CI (#7209) * Upgrade Gulp and Nodejs (#7208) * feat: upgrade sass and gulp sass so that it installs on a modern node.js * fix: upgrade some packages and gulp config to 4.x series * fix: add support for icons working as well * Feat: get some tasks to work * fix: port one more tasks even if it is still erroring * wip: still broken config for webpack bundle * fix: let the new tests run * fix: issue with lint task * fix: some more issues with loaders * feat: get some tests passing atleast * fix: the frontend tests pass now * feat: generate new lock file * feat: use gulp 4.x * feat: make build use node16 as well * feat: add .nvmrc for a consistent experience * feat: Run workflows in concurrency groups (#7211) * feat: Added concurrency config using unique workflow groups * Remove whitespace to test cancellation * Remove whitespace to test cancellation 2 Co-authored-by: Vinit Kumar <mail@vinitkumar.me> * fix: Toolbar bug in 3.10 (#7232) Co-authored-by: fsbraun <fsbraun@gmx.de> Co-authored-by: Mark Walker <theshow@gmail.com> Co-authored-by: Simon Krull <simondotunix@gmail.com> Co-authored-by: fsbraun <fsbraun@gmx.de> * fix: using .nvmrc to target teh right nvm version * Release/3.10.x (#7260) Releasing 3.10.0RC2 * [3.10.0rc2 release process] Bumped version to 3.10.0rc2 * [3.10.0rc2 release process] compilemessages * [3.10.0rc2 release process] compiling new static files * [3.10.0rc2 release process] updating latest docs * Update release script to make it compatible with BSD (macos) compatible * Update release script to make it compatible with BSD (macos) compatible * Release/3.10.x (#7275) * Fixes #7288 by also catching AttributeError, when the current toolbar… (#7289) * Fixes #7288 by also catching AttributeError, when the current toolbar object doesn't define get_draft_url() * #7288: also catch AttributeError when `get_absolute_url()` isn't defined. * Fix for django 2.2 in middleware [#7290] (#7293) * Fix for django 2.2 in middleware [#7290] * Address isort concern * Update release script to make it compatible with BSD (macos) compatible (#7294) * Fix release script version commit. (#7295) * Update release script to make it compatible with BSD (macos) compatible * Fix version number in bump commit * fix: typos in CHANGELOG.rst Co-authored-by: Florian Delizy <fdelizy@logitech.com> Co-authored-by: Vinit Kumar <mail@vinitkumar.me> Co-authored-by: Simon Krull <simondotunix@gmail.com> Co-authored-by: fsbraun <fsbraun@gmx.de> Co-authored-by: Marco Bonetti <mbonetti@gmail.com>
1 parent 8ffc648 commit 994f928

File tree

4 files changed

+22
-14
lines changed

4 files changed

+22
-14
lines changed

‎CHANGELOG.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ Changelog
55
unreleased
66
==========
77

8+
* Added dark mode support to css
9+
* Fix publishing of static placeholders outside of CMS pages
10+
* Allow to override the template rendered after a plugin has been saved.
811

912
3.10.0 (2022-03-26)
1013
===================
@@ -72,10 +75,6 @@ With the review help of the following contributors:
7275

7376
Thanks to all contributors for their efforts!
7477

75-
* Added dark mode support to css
76-
* Fix publishing of static placeholders outside of CMS pages
77-
* Allow to override the template rendered after a plugin has been saved.
78-
7978
3.9.0 (2021-06-30)
8079
==================
8180

‎cms/middleware/language.py

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
from django.utils.deprecation import MiddlewareMixin
33
from django.utils.translation import get_language
44

5+
from cms.utils.compat import DJANGO_3_0
6+
57

68
class LanguageCookieMiddleware(MiddlewareMixin):
79
def __init__(self, get_response):
@@ -18,14 +20,21 @@ def __call__(self, request):
1820
# To ensure support of very old browsers, Django processed automatically "expires" according to max_age value.
1921
# https://docs.djangoproject.com/en/3.2/ref/request-response/#django.http.HttpResponse.set_cookie
2022

23+
cookie_kwargs = {
24+
'value': language,
25+
'domain': settings.LANGUAGE_COOKIE_DOMAIN,
26+
'max_age': settings.LANGUAGE_COOKIE_AGE or 365 * 24 * 60 * 60, # 1 year
27+
'path': settings.LANGUAGE_COOKIE_PATH,
28+
}
29+
if DJANGO_3_0:
30+
cookie_kwargs.update({
31+
'httponly': settings.LANGUAGE_COOKIE_HTTPONLY,
32+
'samesite': settings.LANGUAGE_COOKIE_SAMESITE,
33+
'secure': settings.LANGUAGE_COOKIE_SECURE,
34+
})
35+
2136
response.set_cookie(
2237
settings.LANGUAGE_COOKIE_NAME,
23-
value=language,
24-
domain=settings.LANGUAGE_COOKIE_DOMAIN,
25-
max_age=settings.LANGUAGE_COOKIE_AGE or 365 * 24 * 60 * 60, # 1 year
26-
httponly=settings.LANGUAGE_COOKIE_HTTPONLY,
27-
path=settings.LANGUAGE_COOKIE_PATH,
28-
samesite=settings.LANGUAGE_COOKIE_SAMESITE,
29-
secure=settings.LANGUAGE_COOKIE_SECURE,
38+
**cookie_kwargs
3039
)
3140
return response

‎cms/toolbar/toolbar.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,10 +326,10 @@ def get_object_draft_url(self):
326326
with force_language(self.request_language):
327327
try:
328328
return self.obj.get_draft_url()
329-
except NoReverseMatch:
329+
except (NoReverseMatch, AttributeError):
330330
try:
331331
return self.obj.get_absolute_url()
332-
except NoReverseMatch:
332+
except (NoReverseMatch, AttributeError):
333333
pass
334334
return ''
335335

‎docs/upgrade/3.10.0.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Bug Fixes:
4949
* Fix styles issues, caused by switching to the ``display: flex`` on the page tree renderer.
5050
* Fixed missing builtin arguments on main ``cms`` management command causing it to crash
5151
* Fixed template label nested translation
52-
* Fixed a bug where the fallback page title would be returned instead of the one from the current language
52+
* Fixed a bug where the fallback page title would be returned instead of the one from the current language
5353
* Fixed an issue when running migrations on a multi database project
5454

5555

0 commit comments

Comments
 (0)
0