working auth.wiki on security
This commit is contained in:
@@ -1 +1 @@
|
|||||||
Version 2.00.0 (2012-07-29 20:54:57) dev
|
Version 2.00.0 (2012-07-29 21:02:21) dev
|
||||||
|
|||||||
+12
-6
@@ -4378,11 +4378,6 @@ class Expose(object):
|
|||||||
H3('Files'),
|
H3('Files'),
|
||||||
self.table_files()).xml()
|
self.table_files()).xml()
|
||||||
|
|
||||||
def first_paragraph(mm):
|
|
||||||
mm = mm.replace('\r','')
|
|
||||||
ps = [p for p in mm.split('\n\n') if not p.startswith('#') and p.strip()]
|
|
||||||
if ps: return ps[0]
|
|
||||||
return ''
|
|
||||||
|
|
||||||
class Wiki(object):
|
class Wiki(object):
|
||||||
everybody = 'everybody'
|
everybody = 'everybody'
|
||||||
@@ -4437,6 +4432,7 @@ class Wiki(object):
|
|||||||
if tag: db.wiki_tag.insert(name=tag,wiki_page=page.id)
|
if tag: db.wiki_tag.insert(name=tag,wiki_page=page.id)
|
||||||
db.wiki_page._after_insert.append(update_tags_insert)
|
db.wiki_page._after_insert.append(update_tags_insert)
|
||||||
db.wiki_page._after_update.append(update_tags_update)
|
db.wiki_page._after_update.append(update_tags_update)
|
||||||
|
|
||||||
def __call__(self):
|
def __call__(self):
|
||||||
request = current.request
|
request = current.request
|
||||||
if self.automenu:
|
if self.automenu:
|
||||||
@@ -4462,6 +4458,16 @@ class Wiki(object):
|
|||||||
return self.cloud()
|
return self.cloud()
|
||||||
else:
|
else:
|
||||||
return self.read(request.args(0) or 'index')
|
return self.read(request.args(0) or 'index')
|
||||||
|
|
||||||
|
def first_paragraph(self,mm):
|
||||||
|
if self.manage_permissions:
|
||||||
|
return ''
|
||||||
|
mm = mm.replace('\r','')
|
||||||
|
ps = [p for p in mm.split('\n\n') \
|
||||||
|
if not p.startswith('#') and p.strip()]
|
||||||
|
if ps: return ps[0]
|
||||||
|
return ''
|
||||||
|
|
||||||
def check_permission(self,page,field='can_read'):
|
def check_permission(self,page,field='can_read'):
|
||||||
if not self.manage_permissions:
|
if not self.manage_permissions:
|
||||||
return True
|
return True
|
||||||
@@ -4615,7 +4621,7 @@ class Wiki(object):
|
|||||||
def link(t):
|
def link(t):
|
||||||
return A(t,_href=URL(args='_search',vars=dict(tags=t)))
|
return A(t,_href=URL(args='_search',vars=dict(tags=t)))
|
||||||
items = [DIV(H3(A(p.title,_href=URL(args=p.slug))),
|
items = [DIV(H3(A(p.title,_href=URL(args=p.slug))),
|
||||||
MARKMIN(first_paragraph(p.body)) \
|
MARKMIN(self.first_paragraph(p.body)) \
|
||||||
if preview else '',
|
if preview else '',
|
||||||
SPAN(*[link(t.strip()) for t in \
|
SPAN(*[link(t.strip()) for t in \
|
||||||
p.tags or [] if t.strip()]),
|
p.tags or [] if t.strip()]),
|
||||||
|
|||||||
Reference in New Issue
Block a user