From b193e63c87fc8cd78fa0b4dccc273fe1a0ffb515 Mon Sep 17 00:00:00 2001 From: richard Date: Mon, 14 Jan 2002 06:45:03 +0000 Subject: [PATCH] . #502953 ] nosy-like treatment of other multilinks ... had to revert most of the previous change to the multilink field display... not good. git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@540 57a73879-2fb5-44c3-a270-3262357dd7e2 --- CHANGES.txt | 1 + roundup/htmltemplate.py | 25 +++++++++++-------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index d232e9c..85e33f8 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -18,6 +18,7 @@ Fixed: instance_config instead of the mish-mash of classes. This will make switching to a ConfigParser setup easier too, I hope. . #502951 ] adding new properties to old database + . #502953 ] nosy-like treatment of other multilinks 2002-01-08 - 0.4.0b1 diff --git a/roundup/htmltemplate.py b/roundup/htmltemplate.py index 09746e3..a1f3a89 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.54 2002-01-14 05:16:51 richard Exp $ +# $Id: htmltemplate.py,v 1.55 2002-01-14 06:45:03 richard Exp $ __doc__ = """ Template engine. @@ -179,23 +179,16 @@ class TemplateFunctions: elif isinstance(propclass, hyperdb.Multilink): list = linkcl.list() list.sort(sortfunc) - k = linkcl.labelprop() l = [] - # special treatment for nosy list - if property == 'nosy': - input_value = [] - else: - input_value = value - for v in value: - lab = linkcl.get(v, k) - if property != 'nosy': - l.append('%s: %s'%(v,v,lab)) - else: - input_value.append(lab) + # map the id to the label property + # TODO: allow reversion to the older '%(property, - size, ','.join(input_value))) + size, ','.join(value))) s = "
\n".join(l) else: s = _('Plain: bad propclass "%(propclass)s"')%locals() @@ -889,6 +882,10 @@ class NewItemTemplate(TemplateFunctions): # # $Log: not supported by cvs2svn $ +# 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. +# # Revision 1.53 2002/01/14 04:03:32 richard # How about that ... date fields have never worked ... # -- 2.30.2