8000 merge #6347 · FinalAngel/django-cms@3063bed · GitHub
[go: up one dir, main page]

Skip to content

Commit 3063bed

Browse files
committed
1 parent 7f31cc9 commit 3063bed

File tree

4 files changed

+13
-1
lines changed

4 files changed

+13
-1
lines changed

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@ Contributors (based on gitlog, 543 unique authors):
289289
* Keryn Knight
290290
* Kevin Burton
291291
* Kevin Funk
292+
* Kevin Möllering
292293
* Kevin Richardson
293294
* Kim Thoenen
294295
* kochin

CHANGELOG.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
=== 3.7.1 (unreleased) ===
22

3+
* Fixed a bug where creating a page via the cms.api.create_page ignores
4+
left/right positions
35
* Updated branch policy
46
* Improved and simplified permissions documentation
57
* Improved apphooks documentation

cms/models/pagemodel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def add_sibling(self, pos=None, *args, **kwargs):
9696
kwargs['instance'].parent_id = self.parent_id
9797
else:
9898
kwargs['parent_id'] = self.parent_id
99-
return super(TreeNode, self).add_sibling(*args, **kwargs)
99+
return super(TreeNode, self).add_sibling(pos, *args, **kwargs)
100100

101101
def update(self, **data):
102102
cls = self.__class__

cms/tests/test_api.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,3 +242,12 @@ def test_create_page_assert_parent_is_draft(self):
242242
def test_create_page_page_title(self):
243243
page = create_page(**dict(self._get_default_create_page_arguments(), page_title='page title'))
244244
self.assertEqual(page.get_title_obj_attribute('page_title'), 'page title')
245+
246+
def test_create_page_with_position_regression_6345(self):
247+
# ref: https://github.com/divio/django-cms/issues/6345
248+
parent = create_page('p', 'nav_playground.html', 'en')
249+
rightmost = create_page('r', 'nav_playground.html', 'en', parent=parent)
250+
leftmost = create_page('l', 'nav_playground.html', 'en', parent=rightmost, position='left')
251+
create_page('m', 'nav_playground.html', 'en', parent=leftmost, position='right')
252+
children_titles = list(p.get_title('de') for p in parent.get_child_pages())
253+
self.assertEqual(children_titles, ['l', 'm', 'r'])

0 commit comments

Comments
 (0)
0