Merge 40191 from trunk: clean up crufty and buggy ZMI views.

lib/python/Products/PluginIndexes/FieldIndex/FieldIndex.py

@@ -40,9 +40,8 @@ class FieldIndex(UnIndex):
 
     query_options = ["query","range"]
 
-    index_html = DTMLFile('dtml/index', globals())
-
-    manage_workspace = DTMLFile('dtml/manageFieldIndex', globals())
+    manage = manage_main = DTMLFile('dtml/manageFieldIndex', globals())
+    manage_main._setName('manage_main')
     manage_browse = DTMLFile('../dtml/browseIndex', globals())
 
 

lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.py

@@ -130,8 +130,8 @@ class KeywordIndex(UnIndex):
             LOG.error('Attempt to unindex nonexistent'
                       ' document id %s' % documentId)
 
-    index_html = DTMLFile('dtml/index', globals())
-    manage_workspace = DTMLFile('dtml/manageKeywordIndex', globals())
+    manage = manage_main = DTMLFile('dtml/manageKeywordIndex', globals())
+    manage_main._setName('manage_main')
     manage_browse = DTMLFile('../dtml/browseIndex', globals())
 
 

lib/python/Products/PluginIndexes/PathIndex/PathIndex.py

@@ -267,8 +267,8 @@ class PathIndex(Persistent, SimpleItem):
             # XXX Why is default ignored?
             return None
 
-    index_html = DTMLFile('dtml/index', globals())
-    manage_workspace = DTMLFile('dtml/managePathIndex', globals())
+    manage = manage_main = DTMLFile('dtml/managePathIndex', globals())
+    manage_main._setName('manage_main')
 
 
 manage_addPathIndexForm = DTMLFile('dtml/addPathIndex', globals())

lib/python/Products/PluginIndexes/TextIndex/TextIndex.py

@@ -652,7 +652,8 @@ class TextIndex(Persistent, Implicit, SimpleItem):
         if RESPONSE:
             RESPONSE.redirect(URL2 + '/manage_main?manage_tabs_message=Preferences%20saved')
 
-    manage_workspace  = DTMLFile("dtml/manageTextIndex",globals())
+    manage = manage_main = DTMLFile("dtml/manageTextIndex",globals())
+    manage_main._setName('manage_main')
     manage_vocabulary = DTMLFile("dtml/manageVocabulary",globals())
 
 

lib/python/Products/PluginIndexes/TopicIndex/TopicIndex.py

@@ -50,7 +50,7 @@ class TopicIndex(Persistent, SimpleItem):
 
     manage_options= (
         {'label': 'FilteredSets',
-         'action': 'manage_workspace',
+         'action': 'manage_main',
          'help': ('TopicIndex','TopicIndex_searchResults.stx')},
     )
 
@@ -195,8 +195,8 @@ class TopicIndex(Persistent, SimpleItem):
             RESPONSE.redirect(URL1+'/manage_workspace?'
              'manage_tabs_message=FilteredSet(s)%20cleared')
 
-    index_html      = DTMLFile('dtml/index', globals())
-    manage_workspace = DTMLFile('dtml/manageTopicIndex',globals())
+    manage = manage_main = DTMLFile('dtml/manageTopicIndex',globals())
+    manage_main._setName('manage_main')
     editFilteredSet = DTMLFile('dtml/editFilteredSet',globals())