File tree Expand file tree Collapse file tree 12 files changed +39
-14
lines changed Expand file tree Collapse file tree 12 files changed +39
-14
lines changed Original file line number Diff line number Diff line change @@ -151,6 +151,9 @@ Fixed:
151
151
- make classhelper link open in a new window by setting
152
152
target="_blank". This prevents overwriting of current page with the
153
153
classhelper if javascript is disabled. (John Rouillard)
154
+ - issue2551341 - if @columns missing from an index url, the
155
+ group headers colspan property = 0. Add "or 100" in
156
+ stanza's so headers span all rows (up to 100).
154
157
155
158
Features:
156
159
Original file line number Diff line number Diff line change @@ -356,6 +356,28 @@ schema.
356
356
357
357
`You can see the diff in the Sourceforge web interface <https://sourceforge.net/p/roundup/code/ci/54eb12cd3be143b079809795dcb2f813f75a691c/tree/share/roundup/templates/devel/html/task.index.html?diff=c95870b2bbab822def6066498a4ef8634e76e0b3>`_.
358
358
359
+ Make group headers span all columns (optional)
360
+ ----------------------------------------------
361
+
362
+ In a number of index pages a version of the following TAL command
363
+ appears::
364
+
365
+ <th tal:attributes="colspan python:len(request.columns)" class="group">
366
+
367
+ If the ``@columns`` parameter (aka request.columns) is not set,
368
+ all columns are shown. However the group header only spans the
369
+ first column. Changing this to read::
370
+
371
+ <th tal:attributes="colspan python:len(request.columns) or 100" class="group">
372
+
373
+ makes the group header span all the columns (if you have fewer
374
+ than 100 columns). All of the supplied templates hae been
375
+ upgraded with this change. `See issue 2551341 for details
376
+ <https://issues.roundup-tracker.org/issue2551341>`_.
377
+
378
+ Note the jinja2 template has the same issue, but the development
379
+ team hasn't devised a solution.
380
+
359
381
Use @current_user in Searches (optional)
360
382
----------------------------------------
361
383
Original file line number Diff line number Diff line change 37
37
< tal:block tal:repeat ="i batch " condition =true >
38
38
< tr tal:define ="group python:[r[1] for r in request.group] "
39
39
tal:condition ="python:group and batch.propchanged(*group) ">
40
- < th tal:attributes ="colspan python:len(request.columns) " class ="group ">
40
+ < th tal:attributes ="colspan python:len(request.columns) or 100 " class ="group ">
41
41
< tal:block tal:repeat ="g group ">
42
42
< tal:block i18n:translate ="" tal:content ="python:str(i[g]) or '(no %s set)'%g "/>
43
43
</ tal:block >
73
73
74
74
< metal:index define-macro ="batch-footer ">
75
75
< tr tal:condition ="batch ">
76
- < th tal:attributes ="colspan python:len(request.columns) ">
76
+ < th tal:attributes ="colspan python:len(request.columns) or 100 ">
77
77
< table width ="100% ">
78
78
< tr class ="navigation ">
79
79
< th >
Original file line number Diff line number Diff line change 75
75
</ tr >
76
76
</ tal:block >
77
77
< tr tal:condition ="batch ">
78
- < th tal:attributes ="colspan python:len(request.columns) ">
78
+ < th tal:attributes ="colspan python:len(request.columns) or 100 ">
79
79
< table width ="100% ">
80
80
< tr class ="navigation ">
81
81
< th >
Original file line number Diff line number Diff line change 42
42
< tal:block tal:repeat ="i batch " condition ="true ">
43
43
< tr tal:define ="group python:[r[1] for r in request.group] "
44
44
tal:condition ="python:group and batch.propchanged(*group) ">
45
- < th tal:attributes ="colspan python:len(request.columns) " class ="group ">
45
+ < th tal:attributes ="colspan python:len(request.columns) or 100 " class ="group ">
46
46
< tal:block tal:repeat ="g group ">
47
47
< tal:block tal:content ="python:str(i[g]) or '(no %s set)'%g "/>
48
48
</ tal:block >
87
87
88
88
< metal:index define-macro ="batch-footer ">
89
89
< tr tal:condition ="batch ">
90
- < th tal:attributes ="colspan python:len(request.columns) ">
90
+ < th tal:attributes ="colspan python:len(request.columns) or 100 ">
91
91
< table width ="100% ">
92
92
< tr class ="navigation ">
93
93
< th >
Original file line number Diff line number Diff line change 31
31
< tal:block tal:repeat ="i batch " condition =true >
32
32
< tr tal:define ="group python:[r[1] for r in request.group] "
33
33
tal:condition ="python:group and batch.propchanged(*group) ">
34
- < th tal:attributes ="colspan python:len(request.columns) " class ="group ">
34
+ < th tal:attributes ="colspan python:len(request.columns) or 100 " class ="group ">
35
35
< tal:block tal:repeat ="g group ">
36
36
< tal:block tal:content ="python:str(i[g]) or '(no %s set)'%g "/>
37
37
</ tal:block >
52
52
53
53
< metal:index define-macro ="batch-footer ">
54
54
< tr tal:condition ="batch ">
55
- < th tal:attributes ="colspan python:len(request.columns) ">
55
+ < th tal:attributes ="colspan python:len(request.columns) or 100 ">
56
56
< table width ="100% ">
57
57
< tr class ="navigation ">
58
58
< th >
Original file line number Diff line number Diff line change 39
39
< tal:block tal:repeat ="i batch " condition ="true ">
40
40
< tr tal:define ="group python:[r[1] for r in request.group] "
41
41
tal:condition ="python:group and batch.propchanged(*group) ">
42
- < th tal:attributes ="colspan python:len(request.columns) " class ="group ">
42
+ < th tal:attributes ="colspan python:len(request.columns) or 100 " class ="group ">
43
43
< tal:block tal:repeat ="g group ">
44
44
< tal:block tal:content ="python:str(i[g]) or '(no %s set)'%g "/>
45
45
</ tal:block >
78
78
79
79
< metal:index define-macro ="batch-footer ">
80
80
< tr tal:condition ="batch ">
81
- < th tal:attributes ="colspan python:len(request.columns) ">
81
+ < th tal:attributes ="colspan python:len(request.columns) or 100 ">
82
82
< table width ="100% ">
83
83
< tr class ="navigation ">
84
84
< th >
Original file line number Diff line number Diff line change 69
69
</ tr >
70
70
</ tal:block >
71
71
< tr tal:condition ="batch ">
72
- < th tal:attributes ="colspan python:len(request.columns) ">
72
+ < th tal:attributes ="colspan python:len(request.columns) or 100 ">
73
73
< table width ="100% ">
74
74
< tr class ="navigation ">
75
75
< th >
Original file line number Diff line number Diff line change 39
39
< tal:block tal:repeat ="i batch " condition ="true ">
40
40
< tr tal:define ="group python:[r[1] for r in request.group] "
41
41
tal:condition ="python:group and batch.propchanged(*group) ">
42
- < th tal:attributes ="colspan python:len(request.columns) " class ="group ">
42
+ < th tal:attributes ="colspan python:len(request.columns) or 100 " class ="group ">
43
43
< tal:block tal:repeat ="g group ">
44
44
< tal:block tal:content ="python:str(i[g]) or '(no %s set)'%g "/>
45
45
</ tal:block >
Original file line number Diff line number Diff line change 31
31
< tal:block tal:repeat ="i batch " condition =true >
32
32
< tr tal:define ="group python:[r[1] for r in request.group] "
33
33
tal:condition ="python:group and batch.propchanged(*group) ">
34
- < th tal:attributes ="colspan python:len(request.columns) " class ="group ">
34
+ < th tal:attributes ="colspan python:len(request.columns) or 100 " class ="group ">
35
35
< tal:block tal:repeat ="g group ">
36
36
< tal:block tal:content ="python:str(i[g]) or '(no %s set)'%g "/>
37
37
</ tal:block >
You can’t perform that action at this time.
0 commit comments