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

possibly fixed issue 1031, thanks villas

Browse Source
This commit is contained in:
mdipierro
2012-09-26 12:45:56 -05:00
parent 9e23b3dac5
commit 74a63e98b5
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/dal.py
+1 -1
View File
@@ -3274,7 +3274,7 @@ class FireBirdAdapter(BaseAdapter):
def select_limitby(self, sql_s, sql_f, sql_t, sql_w, sql_o, limitby):
if limitby:
(lmin, lmax) = limitby
sql_s += ' FIRST %i SKIP %i' % (lmax - lmin, lmin)
sql_s = ' FIRST %i SKIP %i %s' % (lmax - lmin, lmin, sql_s)
return 'SELECT %s %s FROM %s%s%s;' % (sql_s, sql_f, sql_t, sql_w, sql_o)
def _truncate(self,table,mode = ''):
gluon/tools.py
+7 -5
View File
@@ -4918,8 +4918,9 @@ class Wiki(object):
query = query|db.wiki_page.title.startswith(request.vars.q)
if self.restrict_search and not self.manage():
query = query&(db.wiki_page.created_by==self.auth.user_id)
pages = db(query).select(
pages = db(query).select(count,
*fields,**dict(orderby=orderby or ~count,
groupby=db.wiki_page.id,
distinct=True,
limitby=limitby))
if request.extension in ('html','load'):
@@ -4928,18 +4929,19 @@ class Wiki(object):
_class='w2p_wiki_form'))
def link(t):
return A(t,_href=URL(args='_search',vars=dict(q=t)))
items = [DIV(H3(A(p.title,_href=URL(args=p.slug))),
MARKMIN(self.first_paragraph(p)) \
items = [DIV(H3(A(p.wiki_page.title,_href=URL(
args=p.wiki_page.slug))),
MARKMIN(self.first_paragraph(p.wiki_page)) \
if preview else '',
DIV(_class='w2p_wiki_tags',
*[link(t.strip()) for t in \
p.tags or [] if t.strip()]),
p.wiki_page.tags or [] if t.strip()]),
_class='w2p_wiki_search_item')
for p in pages]
content.append(DIV(_class='w2p_wiki_pages',*items))
else:
cloud=False
content = [p.as_dict() for p in pages]
content = [p.wiki_page.as_dict() for p in pages]
elif cloud:
content.append(self.cloud()['content'])
if request.extension=='load':