Skip to content

Commit 51fac62

Browse files
author
Richard Jones
committed
Fixed bug in the generation of links to Link/Multilink in indexes.
(thanks Hubert Hoegl) Added AssignedTo to the "classic" schema's item page.
1 parent aa7f24b commit 51fac62

File tree

4 files changed

+26
-7
lines changed

4 files changed

+26
-7
lines changed

roundup/htmltemplate.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
1616
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
1717
#
18-
# $Id: htmltemplate.py,v 1.22 2001-08-30 06:01:17 richard Exp $
18+
# $Id: htmltemplate.py,v 1.23 2001-09-10 09:47:18 richard Exp $
1919

2020
import os, re, StringIO, urllib, cgi, errno
2121

@@ -207,19 +207,21 @@ def __call__(self, property=None, **args):
207207
if isinstance(propclass, hyperdb.Multilink): value = []
208208
else: value = ''
209209
if isinstance(propclass, hyperdb.Link):
210+
linkname = propclass.classname
210211
if value is None:
211212
return '[not assigned]'
212-
linkcl = self.db.classes[propclass.classname]
213+
linkcl = self.db.classes[linkname]
213214
k = linkcl.labelprop()
214215
linkvalue = linkcl.get(value, k)
215-
return '<a href="%s%s">%s</a>'%(linkcl, value, linkvalue)
216+
return '<a href="%s%s">%s</a>'%(linkname, value, linkvalue)
216217
if isinstance(propclass, hyperdb.Multilink):
217-
linkcl = self.db.classes[propclass.classname]
218+
linkname = propclass.classname
219+
linkcl = self.db.classes[linkname]
218220
k = linkcl.labelprop()
219221
l = []
220222
for value in value:
221223
linkvalue = linkcl.get(value, k)
222-
l.append('<a href="%s%s">%s</a>'%(linkcl, value, linkvalue))
224+
l.append('<a href="%s%s">%s</a>'%(linkname, value, linkvalue))
223225
return ', '.join(l)
224226
return '<a href="%s%s">%s</a>'%(self.classname, self.nodeid, value)
225227

@@ -743,6 +745,9 @@ def newitem(client, templates, db, classname, form, replace=re.compile(
743745

744746
#
745747
# $Log: not supported by cvs2svn $
748+
# Revision 1.22 2001/08/30 06:01:17 richard
749+
# Fixed missing import in mailgw :(
750+
#
746751
# Revision 1.21 2001/08/16 07:34:59 richard
747752
# better CGI text searching - but hidden filter fields are disappearing...
748753
#

roundup/templates/classic/html/issue.index

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $Id: issue.index,v 1.2 2001-07-29 04:07:37 richard Exp $-->
1+
<!-- dollarId: issue.index,v 1.2 2001/07/29 04:07:37 richard Exp dollar-->
22
<tr class="row-<display call="plain('status')">">
33
<property name="id">
44
<td valign="top"><display call="plain('id')"></td>

roundup/templates/classic/html/issue.item

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $Id: issue.item,v 1.4 2001-08-03 01:19:43 richard Exp $-->
1+
<!-- dollarId: issue.item,v 1.4 2001/08/03 01:19:43 richard Exp dollar-->
22
<table border=0 cellspacing=0 cellpadding=2>
33

44
<tr bgcolor="ffffea">
@@ -28,6 +28,13 @@
2828
<td class="form-text"><display call="field('nosy')"></td>
2929
</tr>
3030

31+
<tr bgcolor="ffffea">
32+
<td width=1% nowrap align=right><span class="form-label">Assigned To</span></td>
33+
<td class="form-text"><display call="field('assignedto')"></td>
34+
<td>&nbsp;</td>
35+
<td>&nbsp;</td>
36+
</tr>
37+
3138
<tr bgcolor="ffffea">
3239
<td width=1% nowrap align=right><span class="form-label">Change Note</span></td>
3340
<td colspan=3 class="form-text"><display call="note()"></td>

roundup/templates/classic/htmlbase.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,13 @@
101101
<td class="form-text"><display call="field('nosy')"></td>
102102
</tr>
103103
104+
<tr bgcolor="ffffea">
105+
<td width=1% nowrap align=right><span class="form-label">Assigned To</span></td>
106+
<td class="form-text"><display call="field('assignedto')"></td>
107+
<td>&nbsp;</td>
108+
<td>&nbsp;</td>
109+
</tr>
110+
104111
<tr bgcolor="ffffea">
105112
<td width=1% nowrap align=right><span class="form-label">Change Note</span></td>
106113
<td colspan=3 class="form-text"><display call="note()"></td>

0 commit comments

Comments
 (0)