Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions addons/wiki/tests/test_wiki.py
Original file line number Diff line number Diff line change
Expand Up @@ -3340,6 +3340,31 @@ def test_bulk_update_wiki_sort(self):
self.assertEqual(result_wiki_child_page2, {'parent_id': wiki_page2_id, 'sort_order': 1})
self.assertEqual(result_wiki_child_page3, {'parent_id': wiki_child_page2_id, 'sort_order': 1})

def _wiki_sort_payload(self):
return {
'sortedData': [
{'name': 'wiki page1', 'id': self.guid1, 'sortOrder': 1, 'children': [], 'fold': False},
{'name': 'wiki page2', 'id': self.guid2, 'sortOrder': 2, 'children': [
{'name': 'wiki child page1', 'id': self.child_guid1, 'sortOrder': 1, 'children': [], 'fold': False},
{'name': 'wiki child page2', 'id': self.child_guid2, 'sortOrder': 2, 'children': [
{'name': 'wiki child page3', 'id': self.child_guid3, 'sortOrder': 1, 'children': [], 'fold': False}
], 'fold': False}
], 'fold': False}
]
}

def test_project_update_wiki_page_sort_requires_login(self):
url = self.project.api_url_for('project_update_wiki_page_sort')
res = self.app.post_json(url, self._wiki_sort_payload(), expect_errors=True)
assert_equal(res.status_code, http_status.HTTP_401_UNAUTHORIZED)

def test_project_update_wiki_page_sort_requires_write_permission(self):
read_user = AuthUserFactory()
self.project.add_contributor(read_user, permissions=READ, auth=Auth(self.user))
url = self.project.api_url_for('project_update_wiki_page_sort')
res = self.app.post_json(url, self._wiki_sort_payload(), auth=read_user.auth, expect_errors=True)
assert_equal(res.status_code, http_status.HTTP_403_FORBIDDEN)

def test_project_update_wiki_page_sort(self):
url = self.project.api_url_for('project_update_wiki_page_sort')
res = self.app.post_json(url, { 'sortedData': [{'name': 'wiki page1', 'id': self.guid1, 'sortOrder': 1, 'children': [], 'fold': False}, {'name': 'wiki page2', 'id': self.guid2, 'sortOrder': 2, 'children': [{'name': 'wiki child page1', 'id': self.child_guid1, 'sortOrder': 1, 'children': [], 'fold': False}, {'name': 'wiki child page2', 'id': self.child_guid2, 'sortOrder': 2, 'children': [{'name': 'wiki child page3', 'id': self.child_guid3, 'sortOrder': 1, 'children': [], 'fold': False}], 'fold': False}], 'fold': False}]}, auth=self.user.auth)
Expand Down
2 changes: 1 addition & 1 deletion addons/wiki/tests/test_wiki_import.py
Original file line number Diff line number Diff line change
Expand Up @@ -2746,7 +2746,7 @@ def test_project_update_wiki_page_sort(self):
}
]
},
auth=self.auth
auth=self.user.auth
)
page_names = ['importpagea1', 'importpageb2', 'wiki child page1', 'wiki child page2', 'wiki child page3']
result_list = list(WikiPage.objects.filter(page_name__in=page_names).order_by('page_name').values_list('page_name', 'parent_id', 'sort_order'))
Expand Down
2 changes: 2 additions & 0 deletions addons/wiki/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -1368,6 +1368,8 @@ def set_wiki_import_task_proces_end(node):
qs_alive_task.update(process_end=process_end)

@must_be_valid_project # returns project
@must_have_permission(WRITE) # returns user, project
@must_not_be_registration
@must_have_addon('wiki', 'node')
def project_update_wiki_page_sort(node, **kwargs):
data = request.get_json()
Expand Down
Loading