8000 Merge branch 'develop' into add_tests_for_79a35c1 · django-cms/django-cms@e8e8fcb · GitHub
[go: up one dir, main page]

Skip to content

Commit e8e8fcb

Browse files
authored
Merge branch 'develop' into add_tests_for_79a35c1
2 parents a2dafee + 7509105 commit e8e8fcb

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

CHANGELOG.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1-
=== 3.8.0 (unreleased) ===
1+
=== 3.7.1 (unreleased) ===
2+
23
* Fixed ``ValueError`` when creating a ``Site``-bound ``StaticPlaceholder``
4+
* Updated branch policy
5+
* Improved and simplified permissions documentation
6+
* Improved apphooks documentation
7+
* Improved CMSPluginBase docu 8000 mentation
8+
* Improved documentation related to nested plugins
39

410

511
=== 3.7.0 (2019-09-25) ===

docs/contributing/development-policies.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ We maintain a number of branches on `our GitHub repository <https://github.com/d
9898
The default target branch for on-going development.
9999

100100
the latest (highest-numbered) ``release/x.y.z``
101-
This is the branch that will become the next release on PyPI. ``develop`` will be merged into ``release/x.y.z``
102-
regularly.
101+
This is the branch that will become the next release on PyPI. Commits will be cherrypicked from ``develop``
102+
and merged into ``release/x.y.z`` during the next iterative release.
103103

104104
Older ``release/x.y.z`` branches
105105
These represent the final point of development (the highest ``y`` of older versions). Releases in the full set of

docs/how_to/custom_plugins.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ achieve this functionality:
706706

707707

708708
If you have attributes of the parent plugin which you need to access in the
709-
child you can access the parent instance using ``get_plugin_instance``:
709+
child you can access the parent instance using ``get_bound_plugin``:
710710

711711
.. code-block:: django
712712
@@ -719,7 +719,7 @@ child you can access the parent instance using ``get_plugin_instance``:
719719
def __init__(self, *args, **kwargs):
720720
super(ChildPluginForm, self).__init__(*args, **kwargs)
721721
if self.instance:
722-
parent, parent_cls = self.instance.parent.get_plugin_instance()
722+
parent, parent_cls = self.instance.parent.get_bound_plugin()
723723
724724
725725
.. _extending_context_menus:

docs/reference/plugins.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ CMSPlugin Attributes and Methods Reference
494494

495495
from djangocms_text_ckeditor.models import Text
496496

497-
plugin = Text.objects.get(pk=1).get_plugin_instance()[0]
497+
plugin = Text.objects.get(pk=1).get_bound_plugin()[0]
498498
plugin.get_translatable_content()
499499
# returns {'body': u'<p>I am text!</p>\n'}
500500

@@ -530,7 +530,7 @@ CMSPlugin Attributes and Methods Reference
530530

531531
from djangocms_text_ckeditor.models import Text
532532

533-
plugin = Text.objects.get(pk=1).get_plugin_instance()[0]
533+
plugin = Text.objects.get(pk=1).get_bound_plugin()[0]
534534
plugin.set_translatable_content({'body': u'<p>This is a different text!</p>\n'})
535535
# returns 3C3C True
536536

0 commit comments

Comments
 (0)
0