[Zope3-checkins] CVS: Zope3/src/zope/app/services - presentation.py:1.3

[Raju Sivalingam]

Update of /cvs-repository/Zope3/src/zope/app/services
In directory cvs.zope.org:/tmp/cvs-serv26733/src/zope/app/services

Modified Files:
	presentation.py 
Log Message:

  --  ZPT Registration



=== Zope3/src/zope/app/services/presentation.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/services/presentation.py:1.2	Fri Nov 21 12:09:59 2003
+++ Zope3/src/zope/app/services/presentation.py	Thu Dec 18 01:09:44 2003
@@ -37,6 +37,9 @@
 import zope.proxy
 import zope.publisher.interfaces.browser
 import zope.schema
+from zope.app.interfaces.container import IAddNotifiable
+from zope.app.interfaces.dependable import IDependable, DependencyError
+from zope.app.interfaces.services.registration import IRegistered
 
 # XXX How do we define skins and layers here?
 # For now, we will leave skin and layer definition to services above,
@@ -370,10 +373,9 @@
         required = False,
         )
 
-    template = zope.app.services.field.ComponentPath(
+    template = zope.app.interfaces.services.registration.ComponentPath(
         title = u"Page template",
         required = False,
-        type = zope.app.services.zpt.IZPTTemplate,
         )
 
     attribute = zope.schema.TextLine(
@@ -393,7 +395,7 @@
 
 class PageRegistration(ViewRegistration):
 
-    zope.interface.implements(IPageRegistration)
+    zope.interface.implements(IPageRegistration, IAddNotifiable)
 
     # We only care about browser pages
     requestType = zope.publisher.interfaces.browser.IBrowserRequest
@@ -465,17 +467,49 @@
             class_  = DefaultClass
 
 
-        # This is needed because we need to do an unrestricted zapi.traverse
-        root = zope.proxy.removeAllProxies(zapi.getRoot(sm))
 
         if self.attribute:
             return (AttrViewFactory(class_, self.attribute), )
 
         else:
-            template = zapi.traverse(root, self.template)
+
+            if self.template[0]=='/':
+                # This is needed because we need to do an unrestricted zapi.
+                # traverse
+                root = zope.proxy.removeAllProxies(zapi.getRoot(sm))
+                template = zapi.traverse(root, self.template)
+            else:
+                template = zapi.traverse(self.__parent__.__parent__,
+                                         self.template)
             return (TemplateViewFactory(class_, template, self.permission), )
 
     factories = property(factories)
+
+
+    def addNotify(self, event):
+        "See IAddNotifiable"
+        template = zapi.traverse(self.__parent__.__parent__,self.template)
+        dependents = zapi.getAdapter(template, IDependable)
+        objectpath = zapi.getPath(self)
+        dependents.addDependent(objectpath)
+        # Also update usage, if supported
+        adapter = zapi.queryAdapter(template, IRegistered)
+        if adapter is not None:
+            adapter.addUsage(objectpath)
+
+
+    def removeNotify(self, event):
+        "See IRemoveNotifiable"
+        super(PageRegistration, self).removeNotify(event)
+        template = zapi.traverse(self.__parent__.__parent__,self.template)
+        dependents = zapi.getAdapter(template, IDependable)
+        objectpath = zapi.getPath(self)
+        dependents.addDependent(objectpath)
+        # Also update usage, if supported
+        adapter = zapi.queryAdapter(template, IRegistered)
+        if adapter is not None:
+            adapter.removeUsage(zapi.getPath(self))
+
 
 class TemplateViewFactory: