[Zapp-cvs-commit] ZApp ZApp_Application.py,1.20,1.21 ZApp_CMFBase.py,1.10,1.11 ZApp_MiscData.py,1.13,1.14

[<ssp...@us...>]

Update of /cvsroot/zapp/ZApp
In directory sc8-pr-cvs1:/tmp/cvs-serv12961

Modified Files:
	ZApp_Application.py ZApp_CMFBase.py ZApp_MiscData.py 
Log Message:
save fixes.. 

Index: ZApp_Application.py
===================================================================
RCS file: /cvsroot/zapp/ZApp/ZApp_Application.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** ZApp_Application.py	30 Jun 2003 20:25:05 -0000	1.20
--- ZApp_Application.py	3 Jul 2003 22:30:02 -0000	1.21
***************
*** 212,217 ****
          """
          specCache = self._v_SpecialistsCache
!         theSpecialistPath = '%s' % '/'.join(specCache.get(specName,None))
!         return self.restrictedTraverse( theSpecialistPath )
  
      def getRelationshipManager(self):
--- 212,220 ----
          """
          specCache = self._v_SpecialistsCache
!         specEntry = specCache.get(specName,None)
!         
!         theSpecialistPath = specEntry and ('%s' % '/'.join(specEntry))
!         result = theSpecialistPath  and self.restrictedTraverse( theSpecialistPath )
!         return result
  
      def getRelationshipManager(self):

Index: ZApp_CMFBase.py
===================================================================
RCS file: /cvsroot/zapp/ZApp/ZApp_CMFBase.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ZApp_CMFBase.py	26 Jun 2003 15:18:52 -0000	1.10
--- ZApp_CMFBase.py	3 Jul 2003 22:30:02 -0000	1.11
***************
*** 31,34 ****
--- 31,36 ----
                       )
  
+     manage_options = PortalContent.manage_options
+ 
      # Declarative security (replaces __ac_permissions__)
  

Index: ZApp_MiscData.py
===================================================================
RCS file: /cvsroot/zapp/ZApp/ZApp_MiscData.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ZApp_MiscData.py	3 Jul 2003 18:23:10 -0000	1.13
--- ZApp_MiscData.py	3 Jul 2003 22:30:02 -0000	1.14
***************
*** 183,187 ****
  
      def getMiscDataSpecialist(self):
!         return self.findApplication().getSpecialist('MiscData')
  
      def getMiscData(self, Manager=None, dataType=''):
--- 183,195 ----
  
      def getMiscDataSpecialist(self):
!         mds = self.findApplication().getSpecialist('MiscData')
!         if not mds:
!             try:
!                 # acquisition failed... try CMF skin, if we're in context..
!                 #
!                 mds = self.getApplication().getSpecialist('MiscData')
!             except AttributeError:
!                 pass
!         return mds
  
      def getMiscData(self, Manager=None, dataType=''):
***************
*** 367,371 ****
                  val = getattr(self, p['id'])
                  if p['type'] == 'date':
!                     val = val.ISO()
                  elif p['type'] != 'string':
                      if val:
--- 375,379 ----
                  val = getattr(self, p['id'])
                  if p['type'] == 'date':
!                     val = (hasattr(val,'ISO') and val.ISO()) or `val`
                  elif p['type'] != 'string':
                      if val: