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

[Andreas Jung]

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

Modified Files:
	catalogIndexes.dtml 
Log Message:
Merging ajung-oneindex-multipleattributes-branch

This implements: http://lists.zope.org/pipermail/zope-coders/20002-November/002680.html



=== Zope/lib/python/Products/ZCatalog/dtml/catalogIndexes.dtml 1.8 => 1.9 ===
--- Zope/lib/python/Products/ZCatalog/dtml/catalogIndexes.dtml:1.8	Sun Dec 22 12:54:07 2002
+++ Zope/lib/python/Products/ZCatalog/dtml/catalogIndexes.dtml	Thu Jan 23 12:46:17 2003
@@ -131,7 +131,12 @@
   <td align="left" valign="top">
   <div class="list-item">
   <a href="Indexes/&dtml.url_quote-sequence-key;/manage_workspace">
-  &dtml-sequence-key; <dtml-if title>(&dtml-title;)</dtml-if>
+  &dtml-sequence-key; 
+  <dtml-try>
+    (indexed attrs: <dtml-var "', '.join(_['sequence-item'].getIndexSourceNames())">)
+  <dtml-except>
+    <dtml-if title> (&dtml-title;) </dtml-if>
+  </dtml-try>
   </a>
   </div>
 
@@ -141,7 +146,7 @@
 
     <td>
     <div class="list-item">
-      <dtml-if "_.string.find(_.str(_.getattr(this(),'__implements__','old')),'PluggableIndexInterface')>-1">
+      <dtml-if "_.string.find(_.str(_.getattr(this(),'__implements__','old')),'PluggableIndex')>-1">
         &dtml-meta_type;
       <dtml-else>
          <dtml-call "REQUEST.set('oldidx',1)">