Author: jmorliaguet
Date: Sun Apr 23 12:58:06 2006
New Revision: 2943
Modified:
cpsskins/branches/paris-sprint-2006/browser/rendering/viewer.py
cpsskins/branches/paris-sprint-2006/thememanager.py
cpsskins/branches/paris-sprint-2006/ui/manager/configure.zcml
cpsskins/branches/paris-sprint-2006/ui/manager/views.py
Log:
- made the renderer more independent of the context
Modified: cpsskins/branches/paris-sprint-2006/browser/rendering/viewer.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/browser/rendering/viewer.py
(original)
+++ cpsskins/branches/paris-sprint-2006/browser/rendering/viewer.py Sun Apr
23 12:58:06 2006
@@ -70,7 +70,8 @@
contexts = {}
tree = contexts['tree'] = {}
- relations = getThemeManager(element).getRelationStorage()
+ tmutil = getThemeManager(element)
+ relations = tmutil.getRelationStorage()
negotiation = getMultiAdapter((element, request),
INegotiation, 'negotiation')
perspective = negotiation.getPerspective()
@@ -90,8 +91,7 @@
# set the current location unless specified
if globals.location is None:
- site = zapi.getSiteManager(element)
- globals.location = zapi.getParent(site)
+ globals.location = tmutil.getSite()
# build the tree and store it in the request
_updateTreeInfo(tree=tree, node=element, globals=globals)
Modified: cpsskins/branches/paris-sprint-2006/thememanager.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/thememanager.py (original)
+++ cpsskins/branches/paris-sprint-2006/thememanager.py Sun Apr 23 12:58:06 2006
@@ -66,6 +66,9 @@
required=False,
)
+ def getSite():
+ """Return the site"""
+
def getIdRegistry():
"""Return the unique id registry."""
@@ -166,6 +169,9 @@
# snapshots
self[u'snapshots'] = SnapshotStorage()
+ def getSite(self):
+ return zapi.getParent(self)
+
###################################################################
# Local utilities
###################################################################
Modified: cpsskins/branches/paris-sprint-2006/ui/manager/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/manager/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/manager/configure.zcml Sun Apr
23 12:58:06 2006
@@ -29,16 +29,4 @@
</pages>
- <pages
- for="*"
- permission="zope.Public"
- class=".ThemeManagerView">
-
- <page
- name="getThemeManager"
- attribute="getThemeManager"
- />
-
- </pages>
-
</configure>
Modified: cpsskins/branches/paris-sprint-2006/ui/manager/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/manager/views.py (original)
+++ cpsskins/branches/paris-sprint-2006/ui/manager/views.py Sun Apr 23
12:58:06 2006
@@ -51,11 +51,10 @@
self.context = context
self.request = request
- def getThemeManager(self):
- return self.context
+ self.tmutil = getThemeManager(context)
def getThemes(self):
- return self.context.getThemes()
+ return self.tmutil.getThemes()
def listThemeInfo(self):
info = []
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
