col in colgroup for grid extracolumns, thanks Anthony
This commit is contained in:
@@ -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
|
||||||
|
|||||||
+7
-2
@@ -2411,8 +2411,10 @@ class SQLFORM(FORM):
|
|||||||
limitby = None
|
limitby = None
|
||||||
|
|
||||||
if rows:
|
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)]
|
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))
|
htmltable = TABLE(COLGROUP(*cols),THEAD(head))
|
||||||
tbody = TBODY()
|
tbody = TBODY()
|
||||||
numrec = 0
|
numrec = 0
|
||||||
@@ -2890,8 +2892,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})
|
cols = [COL(_id=c.replace('.','-'),data={'position':i+1})
|
||||||
for i,c in enumerate(columns)]
|
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))
|
components.append(COLGROUP(*cols))
|
||||||
|
|
||||||
if headers is None:
|
if headers is None:
|
||||||
|
|||||||
Reference in New Issue
Block a user