[Zope-Checkins] CVS: Zope/lib/python/Products/ZCatalog/dtml - catalogIndexes.dtml:1.10

Shane Hathaway shane@zope.com
Tue, 4 Feb 2003 16:39:17 -0500


Update of /cvs-repository/Zope/lib/python/Products/ZCatalog/dtml
In directory cvs.zope.org:/tmp/cvs-serv28738

Modified Files:
	catalogIndexes.dtml 
Log Message:
Show the indexed attribute names only if different from the ID of the index.


=== Zope/lib/python/Products/ZCatalog/dtml/catalogIndexes.dtml 1.9 => 1.10 ===
--- Zope/lib/python/Products/ZCatalog/dtml/catalogIndexes.dtml:1.9	Thu Jan 23 12:46:17 2003
+++ Zope/lib/python/Products/ZCatalog/dtml/catalogIndexes.dtml	Tue Feb  4 16:39:14 2003
@@ -133,7 +133,12 @@
   <a href="Indexes/&dtml.url_quote-sequence-key;/manage_workspace">
   &dtml-sequence-key; 
   <dtml-try>
-    (indexed attrs: <dtml-var "', '.join(_['sequence-item'].getIndexSourceNames())">)
+   <dtml-let source_names="_['sequence-item'].getIndexSourceNames()">
+    <dtml-if expr="_.len(source_names) != 1
+                   or source_names[0] != _['sequence-key']">
+     (indexed attributes: <dtml-var "', '.join(source_names)">)
+    </dtml-if>
+   </dtml-let>
   <dtml-except>
     <dtml-if title> (&dtml-title;) </dtml-if>
   </dtml-try>