fixed colgroup issue in grid, thanks Anthony

This commit is contained in:
Massimo
2013-11-07 10:47:57 -06:00
parent 73ab77ad8b
commit f95476c51e
2 changed files with 11 additions and 8 deletions
+1 -1
View File
@@ -1 +1 @@
Version 2.7.4-stable+timestamp.2013.11.07.10.31.18 Version 2.7.4-stable+timestamp.2013.11.07.10.47.19
+10 -7
View File
@@ -2420,11 +2420,14 @@ class SQLFORM(FORM):
limitby = None limitby = None
if rows: if rows:
cols = [COL(_id=str(c).replace('.','-'),data={'position':i+1}) cols = [COL(_id=str(c).replace('.', '-'),
data={'column': left_cols + i + 1})
for i,c in enumerate(columns)] for i,c in enumerate(columns)]
n = len(head.components) n = len(head.components)
cols = [COL() for i in range(left_cols)] + cols + [ cols = [COL(data={'column': i + 1}) for i in range(left_cols)] + \
COL() for i in range(right_cols)] cols + \
[COL(data={'column': left_cols + len(cols) + i + 1})
for i in range(right_cols)]
htmltable = TABLE(COLGROUP(*cols),THEAD(head)) htmltable = TABLE(COLGROUP(*cols),THEAD(head))
tbody = TBODY() tbody = TBODY()
numrec = 0 numrec = 0
@@ -2902,11 +2905,11 @@ class SQLTABLE(TABLE):
field = sqlrows.db[t][f] field = sqlrows.db[t][f]
headers[c] = field.label headers[c] = field.label
if colgroup: if colgroup:
cols = [COL(_id=c.replace('.','-'),data={'position':i+1}) cols = [COL(_id=c.replace('.', '-'), data={'column': i + 1})
for i,c in enumerate(columns)] for i, c in enumerate(columns)]
if extracolumns: if extracolumns:
cols += [COL(data={'position':len(cols)+i+1}) cols += [COL(data={'column': len(cols) + i + 1})
for i,c in enumerate(extracolumns)] for i, c in enumerate(extracolumns)]
components.append(COLGROUP(*cols)) components.append(COLGROUP(*cols))
if headers is None: if headers is None: