8000 Backport to prepare for 3.7.1 (#6762) · django-cms/django-cms@e0e203e · GitHub
[go: up one dir, main page]
Skip to content

Commit e0e203e

Browse files
FinalAngelFinalAngel
authored
Backport to prepare for 3.7.1 (#6762)
* Improved and simplified permissions documentation (#6224) [ci-skip] * Updated branch policy (#6320) * Updated branch policy [ci only docs] * Removed feature branch notes from policy * Improve apphooks documentation (#6743) Remove a reference to `urls` attribute on AppHook class in the documentation. * Fix documentation bug regarding CMSPluginBase (#6744) The documentation advertises that you can set the module attribute of custom plugins to None. If the user attempts this django they won't be able to start up when django.contrib.admin.site.urls is included in urls.py (tested with django 1.11.25 and django-cms 3.7.0). * Added example of `get_plugin_instance` to the docs on nested plugins. (#6609) * Amend Changelog and fixes from merged PRs (#6755) * add missing changelog entries * update docs * updated changelog * updates from comments * Sites - Pass Site obj instead of pk when creating a StaticPlaceholder (#6679) * Pass site object instead of pk when rendering menu Add original fix by @saqlainsyed007 * Moved test to it's own class * Update changelog * Do not let non-staff users to log in via CMS Toolbar (#6705) * Merged stale PR's (#6759) * add missing changelog entries * update docs * updated changelog * updates from comments * merge #6347 * merged #6530 * merge #6538 * merge #6549 * merge #6704 * changelog for #6705 * Update issue templates * Fixed #6737 -- Fix 'urls.W001' warning with custom apphook urls (#6738) * Refs #6737 -- Add test for apphooks urls config check * Fixed #6737 -- Fix 'urls.W001' warning with custom apphook urls When rewriting the apphooks urls in appresolver.recurse_patterns, the original RegexPattern.is_endpoint flag is lost, so urls with a callback view throws an "include with a route ending with a '$'" warning ('urls.W001'). @apphook_pool.register class MyApp(CMSApp): name = "MyApp" def get_urls(self, page=None, language=None, **kwargs): return [ re_path(r"^$", views.MyAppView.as_view(), name="my-app-index") # or this # path(r"", views.MyAppView.as_view(), name="my-app-index") ] $ ./manage.py 8000 check System check identified some issues: WARNINGS: ?: (urls.W001) Your URL pattern '^my-app-url/my-view-url/$' [name='my-app-index'] uses include with a route ending with a '$'. Remove the dollar from the route to avoid problems including URLs. This fix set the RegexPattern flag is_endpoint to True for callback views in appresolver.recurse_patterns as in https://github.com/django/django/blob/stable/2.2.x/django/urls/conf.py#L70 * Updated documentation and files for 3.7 LTS (#6761) * general updates * updates from comments * update form comments
1 parent 317ee96 commit e0e203e

40 files changed

+668
-1049
lines changed

‎.coveragerc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[run]
2+
branch = False
23
source =
34
cms
45
menus
5-
branch = False
66
omit =
77
cms/migrations/*
88
cms/south_migrations/*

‎.github/CONTRIBUTING.rst

Lines changed: 0 additions & 78 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/---bug-report.md

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
---
2+
name: "\U0001F41E Bug report"
3+
about: Something isn't working as expected? Here is the right place to report.
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
<!--
11+
Please fill in each section below, otherwise, your issue will be closed.
12+
This info allows django CMS maintainers to diagnose (and fix!) your issue
13+
as quickly as possible.
14+
-->
15+
16+
## Description
17+
18+
<!--
19+
If this is a security issue stop immediately and follow the instructions at:
20+
http://docs.django-cms.org/en/latest/contributing/development-policies.html#reporting-security-issues
21+
-->
22+
23+
## Steps to reproduce
24+
25+
<!--
26+
Clear steps describing how to reproduce the issue.
27+
-->
28+
29+
## Expected behaviour
30+
31+
<!--
32+
A clear and concise description of what you expected to happen.
33+
-->
34+
35+
## Actual behaviour
36+
37+
<!--
38+
A clear and concise description of what is actually happening.
39+
-->
40+
41+
## Additional information
42+
43+
<!--
44+
Add any other context about the problem such as environment,
45+
CMS/Python/Django versions, logs etc. here.
46+
-->

‎.github/ISSUE_TEMPLATE/---feature-requests.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
name: "\U0001F4A1 Feature requests"
3+
about: Please submit and discuss feature requests via google groups.
4+
title: "[FEATURE]"
5+
labels: 'status: marked for rejection'
6+
assignees: ''
7+
8+
---
9+
10+
<!--
11+
Please submit any feature requests through our developers email list:
12+
https://groups.google.com/forum/#!forum/django-cms-developers
13+
-->

‎.github/ISSUE_TEMPLATE/---question.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
name: "\U0001F914 Question"
3+
about: Please use our community channels to ask for questions.
4+
title: ''
5+
labels: 'status: marked for rejection'
6+
assignees: ''
7+
8+
---
9+
10+
<!--
11+
For *help with django CMS*, please use our one of the following channels:
12+
13+
* StackOverflow: https://stackoverflow.com/questions/tagged/django-cms
14+
* Users mailing list: https://groups.google.com/forum/#!forum/django-cms
15+
* #django-cms on freenode.net
16+
17+
Questions submitted through GitHub will be closed. Our community is very
18+
helpful and we try to answer as many questions as you may have.
19+
-->

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,29 @@
1+
## Description
2+
13
<!--
2-
If this is a security-related patch stop immediately!
3-
See http://docs.django-cms.org/en/latest/contributing/development-policies.html
4+
If this is a security issue stop right here and follow our documentation:
5+
http://docs.django-cms.org/en/latest/contributing/development-policies.html#reporting-security-issues
46
-->
57

8+
## Related resources
69

7-
### Summary
8-
9-
Fixes #
10-
11-
12-
### Links to related discussion
10+
<!--
11+
Add here links to existing issues or conversation from GitHub
12+
or any other resource.
13+
-->
1314

15+
* #...
16+
* #...
1417

15-
### Proposed changes in this pull request
18+
## Checklist
1619

20+
<!--
21+
Please check the following items before submitting, otherwise,
22+
your pull request will be closed.
1723
18-
### General checklist
24+
Use 'x' to check each item: [x] I have ...
25+
-->
1926

20-
* [ ] I have updated the CHANGELOG.txt
21-
* [ ] I have created backports if necessary
22-
* [ ] I have updated the documentation and/or amended the upgrade section
23-
if necessary
27+
* [ ] I have opened this pull request against ``develop``
28+
* [ ] I have updated the **CHANGELOG.rst**
29+
* [ ] I have added or modified the tests when changing logic

‎.tx/config

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1+
[main]
2+
host = https://www.transifex.com
3+
14
[django-cms.js]
25
file_filter = cms/locale/<lang>/LC_MESSAGES/djangojs.po
36
source_file = cms/locale/en/LC_MESSAGES/djangojs.po
47
source_lang = en
58

6-
[main]
7-
host = https://www.transifex.com
8-
99
[django-cms.core]
1010
file_filter = cms/locale/<lang>/LC_MESSAGES/django.po
1111
source_file = cms/locale/en/LC_MESSAGES/django.po
1212
source_lang = en
13-

0 commit comments

Comments
 (0)
0