From 7dc5b42247d24d297bd78fcb094b5568e23e8dd0 Mon Sep 17 00:00:00 2001 From: richard Date: Mon, 14 Jan 2002 07:04:36 +0000 Subject: [PATCH] . plain rendering of links in the htmltemplate now generate a hyperlink to the linked node's page. ... this allows a display very similar to bugzilla's where you can actually find out information about the linked node. git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@543 57a73879-2fb5-44c3-a270-3262357dd7e2 --- CHANGES.txt | 2 ++ roundup/htmltemplate.py | 17 +++++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 6f8192d..906a851 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -20,6 +20,8 @@ Fixed: . #502951 ] adding new properties to old database . #502953 ] nosy-like treatment of other multilinks . #503164 ] create and passwords + . plain rendering of links in the htmltemplate now generate a hyperlink to + the linked node's page. 2002-01-08 - 0.4.0b1 diff --git a/roundup/htmltemplate.py b/roundup/htmltemplate.py index a1f3a89..3b98e92 100644 --- 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.55 2002-01-14 06:45:03 richard Exp $ +# $Id: htmltemplate.py,v 1.56 2002-01-14 07:04:36 richard Exp $ __doc__ = """ Template engine. @@ -85,12 +85,16 @@ class TemplateFunctions: elif isinstance(propclass, hyperdb.Link): linkcl = self.db.classes[propclass.classname] k = linkcl.labelprop() - if value: value = str(linkcl.get(value, k)) - else: value = _('[unselected]') + if value: + value = '%s'%(propclass.classname, value, + linkcl.get(value, k)) + else: + value = _('[unselected]') elif isinstance(propclass, hyperdb.Multilink): linkcl = self.db.classes[propclass.classname] k = linkcl.labelprop() - value = ', '.join([linkcl.get(i, k) for i in value]) + value = ', '.join(['%s'%(propclass.classname, + i, linkcl.get(i, k)) for i in value]) else: s = _('Plain: bad propclass "%(propclass)s"')%locals() if escape: @@ -882,6 +886,11 @@ class NewItemTemplate(TemplateFunctions): # # $Log: not supported by cvs2svn $ +# Revision 1.55 2002/01/14 06:45:03 richard +# . #502953 ] nosy-like treatment of other multilinks +# ... had to revert most of the previous change to the multilink field +# display... not good. +# # Revision 1.54 2002/01/14 05:16:51 richard # The submit buttons need a name attribute or mozilla won't submit without a # file upload. Yeah, that's bloody obscure. Grr. -- 2.30.2