From 56dcaff2369680dd7cacf483cad904aed2f5c9b1 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Tue, 20 Aug 2013 03:22:54 -0500 Subject: [PATCH] fixed a problem with sortable grid, new icons --- VERSION | 2 +- gluon/sqlhtml.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 395edf99..906b14c1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.6.0-development+timestamp.2013.08.20.01.33.36 +Version 2.6.0-development+timestamp.2013.08.20.03.21.53 diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index 7c87ae6e..b439628e 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -1750,7 +1750,7 @@ class SQLFORM(FORM): oncreate=None, onupdate=None, ondelete=None, - sorter_icons=(XML('↑'), XML('↓')), + sorter_icons=(XML('▲'), XML('▼')), ui = 'web2py', showbuttontext=True, _class="web2py_grid", @@ -2210,7 +2210,7 @@ class SQLFORM(FORM): marker = sorter_icons[1] else: if key == ordermatch: - key, marker = '~' + order, sorter_icons[0] + key, marker = '~' + ordermatch, sorter_icons[0] elif key == ordermatch[1:]: marker = sorter_icons[1] header = A(header, marker, _href=url(vars=dict(