Fixed bug in the generation of links to Link/Multilink in indexes.

  (thanks Hubert Hoegl)
Added AssignedTo to the "classic" schema's item page.

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@253 57a73879-2fb5-44c3-a270-3262357dd7e2

diff --git a/roundup/htmltemplate.py b/roundup/htmltemplate.py
index 7e9eb907f0cd935897903a41a1396aff92f1c14e..de6f10de8c200c229f2ea923cc81fef7c62bd9eb 100644 (file)
--- a/roundup/htmltemplate.py
+++ b/roundup/htmltemplate.py
@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: htmltemplate.py,v 1.22 2001-08-30 06:01:17 richard Exp $
+# $Id: htmltemplate.py,v 1.23 2001-09-10 09:47:18 richard Exp $
 
 import os, re, StringIO, urllib, cgi, errno
 
@@ -207,19 +207,21 @@ class Link(Base):
             if isinstance(propclass, hyperdb.Multilink): value = []
             else: value = ''
         if isinstance(propclass, hyperdb.Link):
+            linkname = propclass.classname
             if value is None:
                 return '[not assigned]'
-            linkcl = self.db.classes[propclass.classname]
+            linkcl = self.db.classes[linkname]
             k = linkcl.labelprop()
             linkvalue = linkcl.get(value, k)
-            return '<a href="%s%s">%s</a>'%(linkcl, value, linkvalue)
+            return '<a href="%s%s">%s</a>'%(linkname, value, linkvalue)
         if isinstance(propclass, hyperdb.Multilink):
-            linkcl = self.db.classes[propclass.classname]
+            linkname = propclass.classname
+            linkcl = self.db.classes[linkname]
             k = linkcl.labelprop()
             l = []
             for value in value:
                 linkvalue = linkcl.get(value, k)
-                l.append('<a href="%s%s">%s</a>'%(linkcl, value, linkvalue))
+                l.append('<a href="%s%s">%s</a>'%(linkname, value, linkvalue))
             return ', '.join(l)
         return '<a href="%s%s">%s</a>'%(self.classname, self.nodeid, value)
 
@@ -743,6 +745,9 @@ def newitem(client, templates, db, classname, form, replace=re.compile(
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.22  2001/08/30 06:01:17  richard
+# Fixed missing import in mailgw :(
+#
 # Revision 1.21  2001/08/16 07:34:59  richard
 # better CGI text searching - but hidden filter fields are disappearing...
 #

diff --git a/roundup/templates/classic/html/issue.index b/roundup/templates/classic/html/issue.index
index 60bc4d7e3b785feb39d4c3389b5d3297b61da114..586cdb5da1c11a8d5af9d177bbebb723232f40a4 100644 (file)
--- a/roundup/templates/classic/html/issue.index
+++ b/roundup/templates/classic/html/issue.index
@@ -1,4 +1,4 @@
-<!-- $Id: issue.index,v 1.2 2001-07-29 04:07:37 richard Exp $-->
+<!-- dollarId: issue.index,v 1.2 2001/07/29 04:07:37 richard Exp dollar-->
 <tr class="row-<display call="plain('status')">">
     <property name="id">
         <td valign="top"><display call="plain('id')"></td>

diff --git a/roundup/templates/classic/html/issue.item b/roundup/templates/classic/html/issue.item
index 81364d47d88be9ad6f4a68db4ae1b3cfd1d9ff17..f0f7c671b08f456c0714963ea09d2d95b62ed554 100644 (file)
--- a/roundup/templates/classic/html/issue.item
+++ b/roundup/templates/classic/html/issue.item
@@ -1,4 +1,4 @@
-<!-- $Id: issue.item,v 1.4 2001-08-03 01:19:43 richard Exp $-->
+<!-- dollarId: issue.item,v 1.4 2001/08/03 01:19:43 richard Exp dollar-->
 <table border=0 cellspacing=0 cellpadding=2>
 
 <tr  bgcolor="ffffea">
@@ -28,6 +28,13 @@
     <td class="form-text"><display call="field('nosy')"></td>
 </tr>
 
+<tr bgcolor="ffffea">
+    <td width=1% nowrap align=right><span class="form-label">Assigned To</span></td>
+    <td class="form-text"><display call="field('assignedto')"></td>
+    <td>&nbsp;</td>
+    <td>&nbsp;</td>
+</tr>
+
 <tr bgcolor="ffffea">
     <td width=1% nowrap align=right><span class="form-label">Change Note</span></td>
     <td colspan=3 class="form-text"><display call="note()"></td>

diff --git a/roundup/templates/classic/htmlbase.py b/roundup/templates/classic/htmlbase.py
index cbebe45b9560cf9939824c94854817f5e4aa41a2..0240c7bddb45b479cbdc27b513b7a44b7ffbe807 100644 (file)
--- a/roundup/templates/classic/htmlbase.py
+++ b/roundup/templates/classic/htmlbase.py
@@ -101,6 +101,13 @@ issueDOTitem = """<!-- dollarId: issue.item,v 1.4 2001/08/03 01:19:43 richard Ex
     <td class="form-text"><display call="field('nosy')"></td>
 </tr>
 
+<tr bgcolor="ffffea">
+    <td width=1% nowrap align=right><span class="form-label">Assigned To</span></td>
+    <td class="form-text"><display call="field('assignedto')"></td>
+    <td>&nbsp;</td>
+    <td>&nbsp;</td>
+</tr>
+
 <tr bgcolor="ffffea">
     <td width=1% nowrap align=right><span class="form-label">Change Note</span></td>
     <td colspan=3 class="form-text"><display call="note()"></td>