Commit cc6a27ba authored by Martijn Pieters's avatar Martijn Pieters

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

parent 99201669
...@@ -40,9 +40,8 @@ class FieldIndex(UnIndex): ...@@ -40,9 +40,8 @@ class FieldIndex(UnIndex):
query_options = ["query","range"] query_options = ["query","range"]
index_html = DTMLFile('dtml/index', globals()) manage = manage_main = DTMLFile('dtml/manageFieldIndex', globals())
manage_main._setName('manage_main')
manage_workspace = DTMLFile('dtml/manageFieldIndex', globals())
manage_browse = DTMLFile('../dtml/browseIndex', globals()) manage_browse = DTMLFile('../dtml/browseIndex', globals())
......
...@@ -130,8 +130,8 @@ class KeywordIndex(UnIndex): ...@@ -130,8 +130,8 @@ class KeywordIndex(UnIndex):
LOG.error('Attempt to unindex nonexistent' LOG.error('Attempt to unindex nonexistent'
' document id %s' % documentId) ' document id %s' % documentId)
index_html = DTMLFile('dtml/index', globals()) manage = manage_main = DTMLFile('dtml/manageKeywordIndex', globals())
manage_workspace = DTMLFile('dtml/manageKeywordIndex', globals()) manage_main._setName('manage_main')
manage_browse = DTMLFile('../dtml/browseIndex', globals()) manage_browse = DTMLFile('../dtml/browseIndex', globals())
......
...@@ -267,8 +267,8 @@ class PathIndex(Persistent, SimpleItem): ...@@ -267,8 +267,8 @@ class PathIndex(Persistent, SimpleItem):
# XXX Why is default ignored? # XXX Why is default ignored?
return None return None
index_html = DTMLFile('dtml/index', globals()) manage = manage_main = DTMLFile('dtml/managePathIndex', globals())
manage_workspace = DTMLFile('dtml/managePathIndex', globals()) manage_main._setName('manage_main')
manage_addPathIndexForm = DTMLFile('dtml/addPathIndex', globals()) manage_addPathIndexForm = DTMLFile('dtml/addPathIndex', globals())
......
...@@ -652,7 +652,8 @@ class TextIndex(Persistent, Implicit, SimpleItem): ...@@ -652,7 +652,8 @@ class TextIndex(Persistent, Implicit, SimpleItem):
if RESPONSE: if RESPONSE:
RESPONSE.redirect(URL2 + '/manage_main?manage_tabs_message=Preferences%20saved') 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()) manage_vocabulary = DTMLFile("dtml/manageVocabulary",globals())
......
...@@ -50,7 +50,7 @@ class TopicIndex(Persistent, SimpleItem): ...@@ -50,7 +50,7 @@ class TopicIndex(Persistent, SimpleItem):
manage_options= ( manage_options= (
{'label': 'FilteredSets', {'label': 'FilteredSets',
'action': 'manage_workspace', 'action': 'manage_main',
'help': ('TopicIndex','TopicIndex_searchResults.stx')}, 'help': ('TopicIndex','TopicIndex_searchResults.stx')},
) )
...@@ -195,8 +195,8 @@ class TopicIndex(Persistent, SimpleItem): ...@@ -195,8 +195,8 @@ class TopicIndex(Persistent, SimpleItem):
RESPONSE.redirect(URL1+'/manage_workspace?' RESPONSE.redirect(URL1+'/manage_workspace?'
'manage_tabs_message=FilteredSet(s)%20cleared') 'manage_tabs_message=FilteredSet(s)%20cleared')
index_html = DTMLFile('dtml/index', globals()) manage = manage_main = DTMLFile('dtml/manageTopicIndex',globals())
manage_workspace = DTMLFile('dtml/manageTopicIndex',globals()) manage_main._setName('manage_main')
editFilteredSet = DTMLFile('dtml/editFilteredSet',globals()) editFilteredSet = DTMLFile('dtml/editFilteredSet',globals())
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment