From b68797766307b2a8d64356d3f3b7c5b3cd599e59 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Tue, 13 Nov 2012 16:27:26 -0600 Subject: [PATCH] fixed 2.5 issues with scheduler --- VERSION | 2 +- gluon/scheduler.py | 8 ++++---- gluon/sqlhtml.py | 8 +++++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/VERSION b/VERSION index 08ff8f13..ad4720f8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.2.1 (2012-11-09 14:11:30) stable +Version 2.2.1 (2012-11-13 16:27:20) stable diff --git a/gluon/scheduler.py b/gluon/scheduler.py index b33a10ba..0f795d19 100644 --- a/gluon/scheduler.py +++ b/gluon/scheduler.py @@ -951,10 +951,10 @@ class Scheduler(MetaScheduler): orderby = ~st.id | ~sr.id row = self.db(q).select( *fields, - orderby=orderby, - left=left, - limitby=(0, 1) - ).first() + **dict(orderby=orderby, + left=left, + limitby=(0, 1)) + ).first() if output: row.result = row.scheduler_run.result and \ loads(row.scheduler_run.result, diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index 772e0e10..62b3c188 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -2079,7 +2079,7 @@ class SQLFORM(FORM): if buttons_placement in ['left', 'both']: headcols.insert(0, TH(_class=ui.get('default',''))) - head = TR(*headcols, _class=ui.get('header')) + head = TR(*headcols, **dict(_class=ui.get('header'))) cursor = True #figure out what page we are one to setup the limitby @@ -2261,9 +2261,11 @@ class SQLFORM(FORM): rid = id if callable(rid): # can this ever be callable? rid = rid(row) - tr = TR(*trcols, _id=rid, _class='%s %s' % (classtr, 'with_id')) + tr = TR(*trcols, **dict( + _id=rid, + _class='%s %s' % (classtr, 'with_id'))) else: - tr = TR(*trcols, _class=classtr) + tr = TR(*trcols, **dict(_class=classtr)) tbody.append(tr) htmltable.append(tbody) htmltable = DIV(htmltable, _style='width:100%;overflow-x:auto')