Skip to content

Commit 39a8887

Browse files
committed
I had an incorrect fix for issue2550601. Changed schema to define
class patches not patch. Changed commented out patches section in bug.item.html to use patches-1 an not patch-1 as a result of schema changes. The show open Milestones link had a leak of the @group value. If you clicked on show open tasks or show open bugs they group by priority. The url being formed for show open milestones was inheriting the @group if you were on an index page for bugs or milestones. Explicit set the @group to status (which a milestone does have) prevents the @group=priority from being applied to a milestone index page which results in a red error banner stating priority is an invalid param for milestones. ./demo.py -t devel now runs without obvious breakage.
1 parent 19bcb02 commit 39a8887

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

share/roundup/templates/devel/html/bug.item.html

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,21 +176,21 @@
176176
<tr tal:condition="context/is_edit_ok">
177177
<th><tal:block i18n:translate="">Patch</tal:block>:</th>
178178
<td colspan="3">
179-
<input type="hidden" name="@link@patches" value="patch-1"/>
180-
<input type="file" name="patch-1@content" size="35"/>
179+
<input type="hidden" name="@link@patches" value="patches-1"/>
180+
<input type="file" name="patches-1@content" size="35"/>
181181
</td>
182182
</tr>
183183
<tr tal:condition="context/is_edit_ok">
184184
<th><tal:block i18n:translate="">Patch Description</tal:block>:</th>
185-
<td colspan=3><input type="edit" name="patch-1@description" size="40"></td>
185+
<td colspan=3><input type="edit" name="patches-1@description" size="40"></td>
186186
</tr>
187187
<tr tal:condition="context/is_edit_ok">
188188
<th><tal:block i18n:translate="">Repository</tal:block>:</th>
189-
<td colspan=3><input type="edit" name="patch-1@repository" size="40"></td>
189+
<td colspan=3><input type="edit" name="patches-1@repository" size="40"></td>
190190
</tr>
191191
<tr tal:condition="context/is_edit_ok">
192192
<th><tal:block i18n:translate="">Repo. Revision</tal:block>:</th>
193-
<td colspan=3><input type="edit" name="patch-1@revision" size="40"></td>
193+
<td colspan=3><input type="edit" name="patches-1@revision" size="40"></td>
194194
</tr>
195195
-->
196196
</table>
@@ -322,3 +322,4 @@
322322
</td>
323323

324324
</tal:block>
325+
<!-- SHA: b8f7d44a12ed641c457adebd68b1e0eab5369e7c -->

share/roundup/templates/devel/html/page.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ <h1><a href="/">Roundup Demo Tracker</a></h1>
144144
'status': milestone_status_notclosed,
145145
'@dispname': i18n.gettext('Show Open'),
146146
'@startwith': 0,
147+
'@group': 'status',
147148
})"
148149
i18n:translate="">Show Open</a>
149150
</li>
@@ -429,3 +430,4 @@ <h1 id="breadcrumb"><span metal:define-slot="body_title">body title</span></h1>
429430
<input metal:define-macro="user_confirm_input" type="password"
430431
tal:attributes="id name; name string:@confirm@$name; readonly not:edit_ok" value=""/>
431432

433+
<!-- SHA: ca32e5f43efcb7c3b4940df6f7a176f6990b15f0 -->

share/roundup/templates/devel/schema.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
description=String(indexme='yes'))
127127

128128
# Patch
129-
patch = FileClass(db, "patch",
129+
patches = FileClass(db, "patches",
130130
name=String(),
131131
description=String(indexme='yes'),
132132
repository=String(),

0 commit comments

Comments
 (0)