diff --git a/VERSION b/VERSION index f4f1a1cc..38d6563e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.4-stable+timestamp.2014.03.09.17.21.20 +Version 2.9.4-stable+timestamp.2014.03.09.17.25.28 diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index ad60baa6..491732fe 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -2599,8 +2599,11 @@ class SQLFORM(FORM): for k, v in sorted(exportManager.items()): if not v: continue - label = v[1] if hasattr(v, "__getitem__") else k - title = v[2] if hasattr(v, "__getitem__") else label + if hasattr(v, "__getitem__"): + label = v[1] + title = v[2] if len(v)>2 else label + else: + label = title = k link = url2(vars=dict( order=request.vars.order or '', _export_type=k,