dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed sorting in Wiki

Browse Source
This commit is contained in:
mdipierro
2012-07-14 18:43:43 -05:00
parent a508e9f8ab
commit 8d3d1b4a5b
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.00.0 (2012-07-14 18:23:57) dev Version 2.00.0 (2012-07-14 18:43:38) dev
gluon/tools.py
+6 -6
View File
@@ -4414,7 +4414,7 @@ class Wiki(object):
self.check_authorization() self.check_authorization()
content=SQLFORM.grid(self.auth.db.wiki_media,args=['_media']) content=SQLFORM.grid(self.auth.db.wiki_media,args=['_media'])
return dict(content=content) return dict(content=content)
def menu(self,controller,function): def menu(self,controller='default',function='index'):
db = self.auth.db db = self.auth.db
request = current.request request = current.request
rows = db().select(db.wiki_page.menu,db.wiki_page.title,db.wiki_page.slug, rows = db().select(db.wiki_page.menu,db.wiki_page.title,db.wiki_page.slug,
@@ -4425,10 +4425,11 @@ class Wiki(object):
key = './'+row.menu key = './'+row.menu
base = key.rsplit('/',1)[0] base = key.rsplit('/',1)[0]
subtree = tree[key] = [] subtree = tree[key] = []
tree[base].append((current.T(row.title), if base in tree:
request.args(0)==row.slug, tree[base].append((current.T(row.title),
URL(controller,function,args=row.slug), request.args(0)==row.slug,
subtree)) URL(controller,function,args=row.slug),
subtree))
if self.check_authorization(act=False): if self.check_authorization(act=False):
submenu = [] submenu = []
if URL() == URL(controller,function) and \ if URL() == URL(controller,function) and \
@@ -4443,7 +4444,6 @@ class Wiki(object):
menu.append((current.T('[Wiki]'),None,None,submenu)) menu.append((current.T('[Wiki]'),None,None,submenu))
return menu return menu
if __name__ == '__main__': if __name__ == '__main__':
import doctest import doctest
doctest.testmod() doctest.testmod()