From 6d3fe6cf89b95f206a34df7ca8628cf5559b19fa Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 2 Nov 2013 10:09:11 -0500 Subject: [PATCH] col in colgroup for grid extracolumns, thanks Anthony --- VERSION | 2 +- gluon/sqlhtml.py | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 1d5985bf..9682ad99 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.7.4-stable+timestamp.2013.11.02.09.25.14 +Version 2.7.4-stable+timestamp.2013.11.02.10.08.01 diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index b24d7b23..472760ca 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -2411,8 +2411,10 @@ class SQLFORM(FORM): limitby = None if rows: - cols = [COL(_id=str(c).replace('.','-'),data={'position':i}) + cols = [COL(_id=str(c).replace('.','-'),data={'position':i+1}) for i,c in enumerate(columns)] + n = len(head.components) + cols += [COL(data={'position':i+1}) for i in range(len(cols),n)] htmltable = TABLE(COLGROUP(*cols),THEAD(head)) tbody = TBODY() numrec = 0 @@ -2890,8 +2892,11 @@ class SQLTABLE(TABLE): field = sqlrows.db[t][f] headers[c] = field.label if colgroup: - cols = [COL(_id=c.replace('.','-'),data={'position':i}) + cols = [COL(_id=c.replace('.','-'),data={'position':i+1}) for i,c in enumerate(columns)] + if extracolumns: + cols += [COL(data={'position':len(cols)+i+1}) + for i,c in enumerate(extracolumns)] components.append(COLGROUP(*cols)) if headers is None: