From c150fab15b36c8f3fb568742b3f18ff4bc79c248 Mon Sep 17 00:00:00 2001 From: richard Date: Fri, 31 May 2002 00:08:02 +0000 Subject: [PATCH] can now just display a link/multilink id - useful for stylesheet stuff git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@768 57a73879-2fb5-44c3-a270-3262357dd7e2 --- roundup/htmltemplate.py | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/roundup/htmltemplate.py b/roundup/htmltemplate.py index b5b9987..e92fdd3 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.90 2002-05-25 07:16:24 rochecompaan Exp $ +# $Id: htmltemplate.py,v 1.91 2002-05-31 00:08:02 richard Exp $ __doc__ = """ Template engine. @@ -60,7 +60,7 @@ class TemplateFunctions: self.cl = None self.properties = None - def do_plain(self, property, escape=0): + def do_plain(self, property, escape=0, lookup=1): ''' display a String property directly; display a Date property in a specified time zone with an option to @@ -68,6 +68,8 @@ class TemplateFunctions: for a Link or Multilink property, display the key strings of the linked nodes (or the ids if the linked class has no key property) + when the lookup argument is true, otherwise just return the + linked ids ''' if not self.nodeid and self.form is None: return _('[Field: not called from item]') @@ -101,19 +103,23 @@ class TemplateFunctions: elif isinstance(propclass, hyperdb.Interval): value = str(value) elif isinstance(propclass, hyperdb.Link): - linkcl = self.db.classes[propclass.classname] - k = linkcl.labelprop() if value: - value = linkcl.get(value, k) + if lookup: + linkcl = self.db.classes[propclass.classname] + k = linkcl.labelprop() + value = linkcl.get(value, k) else: value = _('[unselected]') elif isinstance(propclass, hyperdb.Multilink): - linkcl = self.db.classes[propclass.classname] - k = linkcl.labelprop() - labels = [] - for v in value: - labels.append(linkcl.get(v, k)) - value = ', '.join(labels) + if lookup: + linkcl = self.db.classes[propclass.classname] + k = linkcl.labelprop() + labels = [] + for v in value: + labels.append(linkcl.get(v, k)) + value = ', '.join(labels) + else: + value = ', '.join(value) else: value = _('Plain: bad propclass "%(propclass)s"')%locals() if escape: @@ -1170,6 +1176,9 @@ class NewItemTemplate(TemplateFunctions): # # $Log: not supported by cvs2svn $ +# Revision 1.90 2002/05/25 07:16:24 rochecompaan +# Merged search_indexing-branch with HEAD +# # Revision 1.89 2002/05/15 06:34:47 richard # forgot to fix the templating for last change # -- 2.30.2