From: richard <richard@57a73879-2fb5-44c3-a270-3262357dd7e2>
Date: Tue, 10 Dec 2002 23:14:33 +0000 (+0000)
Subject: allow StringHTMLProperty in MultilinkHTMLProperty test to work
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=097777146eab114e06f815b3fd5251b0aba2e70e;p=roundup.git

allow StringHTMLProperty in MultilinkHTMLProperty test to work


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

diff --git a/CHANGES.txt b/CHANGES.txt
index 17d3e39..4c3306b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -18,6 +18,7 @@ are given with the most recent entry first.
 - bad entries for multilink editing in cgi don't traceback now (sf bug 640310)
 - detect and break email loops (sf bug 640854)
 - finished of handling of retired flag in filter() (sf bug 635260)
+- allow StringHTMLProperty in MultilinkHTMLProperty test to work
 
 
 2002-11-07 0.5.2
diff --git a/roundup/cgi/templating.py b/roundup/cgi/templating.py
index 5565fe9..3afd9b5 100644
--- a/roundup/cgi/templating.py
+++ b/roundup/cgi/templating.py
@@ -1091,9 +1091,10 @@ class MultilinkHTMLProperty(HTMLProperty):
         return klass(self._client, self._prop.classname, value)
 
     def __contains__(self, value):
-        ''' Support the "in" operator
+        ''' Support the "in" operator. We have to make sure the passed-in
+            value is a string first, not a *HTMLProperty.
         '''
-        return value in self._value
+        return str(value) in self._value
 
     def reverse(self):
         ''' return the list in reverse order