Log message for revision 40196: Merge r. 40191 from the trunk; cleanup of ZMI view declarations.
Changed: U Zope/branches/Zope-2_9-branch/lib/python/Products/PluginIndexes/FieldIndex/FieldIndex.py U Zope/branches/Zope-2_9-branch/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.py U Zope/branches/Zope-2_9-branch/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py U Zope/branches/Zope-2_9-branch/lib/python/Products/PluginIndexes/TextIndex/TextIndex.py U Zope/branches/Zope-2_9-branch/lib/python/Products/PluginIndexes/TopicIndex/TopicIndex.py -=- Modified: Zope/branches/Zope-2_9-branch/lib/python/Products/PluginIndexes/FieldIndex/FieldIndex.py =================================================================== --- Zope/branches/Zope-2_9-branch/lib/python/Products/PluginIndexes/FieldIndex/FieldIndex.py 2005-11-17 14:31:19 UTC (rev 40195) +++ Zope/branches/Zope-2_9-branch/lib/python/Products/PluginIndexes/FieldIndex/FieldIndex.py 2005-11-17 17:36:19 UTC (rev 40196) @@ -40,9 +40,8 @@ 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()) Modified: Zope/branches/Zope-2_9-branch/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.py =================================================================== --- Zope/branches/Zope-2_9-branch/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.py 2005-11-17 14:31:19 UTC (rev 40195) +++ Zope/branches/Zope-2_9-branch/lib/python/Products/PluginIndexes/KeywordIndex/KeywordIndex.py 2005-11-17 17:36:19 UTC (rev 40196) @@ -130,8 +130,8 @@ 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()) Modified: Zope/branches/Zope-2_9-branch/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py =================================================================== --- Zope/branches/Zope-2_9-branch/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py 2005-11-17 14:31:19 UTC (rev 40195) +++ Zope/branches/Zope-2_9-branch/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py 2005-11-17 17:36:19 UTC (rev 40196) @@ -267,8 +267,8 @@ # 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()) Modified: Zope/branches/Zope-2_9-branch/lib/python/Products/PluginIndexes/TextIndex/TextIndex.py =================================================================== --- Zope/branches/Zope-2_9-branch/lib/python/Products/PluginIndexes/TextIndex/TextIndex.py 2005-11-17 14:31:19 UTC (rev 40195) +++ Zope/branches/Zope-2_9-branch/lib/python/Products/PluginIndexes/TextIndex/TextIndex.py 2005-11-17 17:36:19 UTC (rev 40196) @@ -652,7 +652,8 @@ 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()) Modified: Zope/branches/Zope-2_9-branch/lib/python/Products/PluginIndexes/TopicIndex/TopicIndex.py =================================================================== --- Zope/branches/Zope-2_9-branch/lib/python/Products/PluginIndexes/TopicIndex/TopicIndex.py 2005-11-17 14:31:19 UTC (rev 40195) +++ Zope/branches/Zope-2_9-branch/lib/python/Products/PluginIndexes/TopicIndex/TopicIndex.py 2005-11-17 17:36:19 UTC (rev 40196) @@ -50,7 +50,7 @@ manage_options= ( {'label': 'FilteredSets', - 'action': 'manage_workspace', + 'action': 'manage_main', 'help': ('TopicIndex','TopicIndex_searchResults.stx')}, ) @@ -195,8 +195,8 @@ 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()) _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins