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

Merge pull request #94 from gazpachoking/flat_index

Browse source 
Allow a flat view of index with the 'flat' query parameter
This commit is contained in:
Matthew Scragg 2016-06-04 20:22:00 -05:00
parent 8f2f9b4805 9f9401a7f7
commit 166728d971
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -115,7 +115,6 @@ def _get_subdir(path, depth):
def _tree_index(items, path=""): def _tree_index(items, path=""):
depth = len(path.split("/")) depth = len(path.split("/"))
items = filter(lambda x: x['name'].startswith(path), items)
items = sorted(items, key=lambda x: x['name']) items = sorted(items, key=lambda x: x['name'])
for subdir, items in itertools.groupby(items, key=lambda x: _get_subdir(x['name'], depth)): for subdir, items in itertools.groupby(items, key=lambda x: _get_subdir(x['name'], depth)):
if not subdir: if not subdir:
@ -145,8 +144,11 @@ def index(path):
items = g.current_wiki.get_index() items = g.current_wiki.get_index()
if path: if path:
path = to_canonical(path) + "/" path = to_canonical(path) + "/"
items = filter(lambda x: x['name'].startswith(path), items)
if not request.args.get('flat', '').lower() in ['yes', '1', 'true']:
items = _tree_index(items, path=path)
return render_template('wiki/index.html', index=_tree_index(items, path=path), path=path) return render_template('wiki/index.html', index=items, path=path)
@blueprint.route("/<path:name>", methods=['POST', 'PUT', 'DELETE']) @blueprint.route("/<path:name>", methods=['POST', 'PUT', 'DELETE'])