Personal/realms-wiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Get delete page feature working

Browse source
This commit is contained in:
Alvin Chow 2015-09-27 21:57:56 -07:00
parent 4ef08cc988
commit 4e4cdf6348
6 changed files with 43 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
realms/modules/search/hooks.py
View file

@ -24,3 +24,12 @@ def wiki_rename_page(old_name, *args, **kwargs):
return
return search.delete_wiki(old_name)
@Wiki.after('delete_page')
def wiki_delete_page(name, *args, **kwargs):
if not hasattr(search, 'index_wiki'):
return
return search.delete_wiki(name)

5
realms/modules/wiki/models.py
View file

@ -156,11 +156,14 @@ class Wiki(HookMixin):
message = "Deleted %s" % name
filename = cname_to_filename(name)
# gittle.rm won't actually remove the file, have to do it ourselves
os.remove(os.path.join(self.path, filename))
self.gittle.rm(filename)
commit = self.gittle.commit(name=username,
email=email,
message=message,
files=[str(filename)])
files=[filename])
cache.delete_many(name)
return commit

5
realms/modules/wiki/tests.py
View file

@ -52,6 +52,11 @@ class WikiTest(WikiBaseTest):
self.assert_403(self.client.delete(url_for('wiki.page_write', name='test')))
self.app.config['WIKI_LOCKED_PAGES'] = []
# Create page, check it exists
self.create_page('test', message='test message', content='testing')
self.assert_200(self.client.get(url_for('wiki.page', name='test')))
# Delete page
self.assert_200(self.client.delete(url_for('wiki.page_write', name='test')))
rv = self.client.get(url_for('wiki.page', name='test'))

4
realms/modules/wiki/views.py
View file

@ -151,12 +151,12 @@ def page_write(name):
return dict(sha=sha)
else:
elif request.method == 'DELETE':
# DELETE
if cname in current_app.config.get('WIKI_LOCKED_PAGES'):
return dict(error=True, message="Page is locked"), 403
sha = g.current_wiki.delete_page(name,
sha = g.current_wiki.delete_page(cname,
username=current_user.username,
email=current_user.email)