[Zope3-checkins] CVS: Zope3/src/zope/app/services - adapter.py:1.4 configuration.py:1.5 configure.zcml:1.7

[Albertas Agejevas]

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

Modified Files:
	adapter.py configuration.py configure.zcml 
Log Message:
Added adapterName to the AdapterConfiguration views.
Fixed a bug where manage_beforeDelete was not being called on
AdapterConfigurations.


=== Zope3/src/zope/app/services/adapter.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/services/adapter.py:1.3	Mon Dec 30 15:42:08 2002
+++ Zope3/src/zope/app/services/adapter.py	Wed Jan 15 10:15:19 2003
@@ -152,12 +152,13 @@
     #     required=False,explicitly_unrequired=True in the schema field
     #     so None will get passed in.
     def __init__(self, forInterface=None, providedInterface=None,
-                 factoryName=None):
+                 factoryName=None, adapterName=u''):
         if None in (providedInterface, factoryName):
             raise TypeError(
                 "Must provide 'providedInterface' and 'factoryName'")
         self.forInterface = forInterface
         self.providedInterface = providedInterface
+        self.adapterName = adapterName
         self.factoryName = factoryName
 
     def getAdapter(self, object):


=== Zope3/src/zope/app/services/configuration.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/services/configuration.py:1.4	Tue Dec 31 08:27:17 2002
+++ Zope3/src/zope/app/services/configuration.py	Wed Jan 15 10:15:19 2003
@@ -264,8 +264,10 @@
         objectstatus = configuration.status
 
         if objectstatus == Active:
-            try: objectpath = getPhysicalPathString(configuration)
-            except: objectpath = str(configuration)
+            try:
+                objectpath = getPhysicalPathString(configuration)
+            except: # XXX
+                objectpath = str(configuration) 
             raise DependencyError("Can't delete active configuration (%s)"
                                   % objectpath)
         elif objectstatus == Registered:


=== Zope3/src/zope/app/services/configure.zcml 1.6 => 1.7 ===
--- Zope3/src/zope/app/services/configure.zcml:1.6	Mon Dec 30 09:03:16 2002
+++ Zope3/src/zope/app/services/configure.zcml	Wed Jan 15 10:15:19 2003
@@ -33,10 +33,6 @@
       interface="zope.app.interfaces.services.interfaces.IAdapterConfiguration"
       set_schema="zope.app.interfaces.services.configuration.IConfiguration"
       />
-  <require
-      permission="zope.ManageServices"
-      interface="zope.app.interfaces.container.IDeleteNotifiable"
-      />
 </content>    
 
 <!-- View Service -->