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

fixed issue 1289, fixed wiki templates, thanks Alan

Browse Source
This commit is contained in:
Massimo
2013-01-18 09:05:39 -06:00
parent ddc6da53b3
commit ea01ec0f0e
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.4.1-alpha.2+timestamp.2013.01.17.17.32.33 Version 2.4.1-alpha.2+timestamp.2013.01.18.09.04.49
gluon/tools.py
+5 -3
View File
@@ -4762,10 +4762,8 @@ class Wiki(object):
perms = self.manage_permissions = manage_permissions perms = self.manage_permissions = manage_permissions
self.restrict_search = restrict_search self.restrict_search = restrict_search
self.extra = extra or {} self.extra = extra or {}
if templates is None and not manage_permissions:
templates = db.auth_wiki.tags.contains('template')&\
db.auth_wiki.can_read.contains('everybody')
self.templates = templates self.templates = templates
table_definitions = [ table_definitions = [
('wiki_page', { ('wiki_page', {
'args':[ 'args':[
@@ -4817,6 +4815,10 @@ class Wiki(object):
args += value['args'] args += value['args']
db.define_table(key, *args, **value['vars']) db.define_table(key, *args, **value['vars'])
if self.templates is None and not self.manage_permissions:
self.templates = db.wiki_page.tags.contains('template')&\
db.wiki_page.can_read.contains('everybody')
def update_tags_insert(page, id, db=db): def update_tags_insert(page, id, db=db):
for tag in page.tags or []: for tag in page.tags or []:
tag = tag.strip().lower() tag = tag.strip().lower()