[Zapp-cvs-commit] ZApp ZApp_Application.py,1.29,1.30 ZApp_CMFBase.py,1.26,1.27 ZApp_MiscData.py,1.25,1.26 ZApp_Specialist.py,1.35,1.36 __init__.py,1.20,1.21

[<ssp...@pr...>]

Update of /cvsroot/zapp/ZApp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17693

Modified Files:
	ZApp_Application.py ZApp_CMFBase.py ZApp_MiscData.py 
	ZApp_Specialist.py __init__.py 
Log Message:
fix some MiscData/ZApp_getItems problems.... you may need to 'Update FS Methods' in ZApp App to use developer view.. 

Index: ZApp_Application.py
===================================================================
RCS file: /cvsroot/zapp/ZApp/ZApp_Application.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** ZApp_Application.py	8 Jan 2004 15:26:50 -0000	1.29
--- ZApp_Application.py	25 Jan 2004 20:58:44 -0000	1.30
***************
*** 179,184 ****
          Folder.manage_options[1:-4]+(
          {'label':'Lever Actions','action':'manage_leverActionsForm',},
-         {'label':'Security','action':'manage_access',
-          'help':('OFSP','Security.stx'),},
          {'label':'Update FS Methods',
           'action':'manage_updateFSMethodsForm',
--- 179,182 ----

Index: ZApp_CMFBase.py
===================================================================
RCS file: /cvsroot/zapp/ZApp/ZApp_CMFBase.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** ZApp_CMFBase.py	21 Jan 2004 14:31:30 -0000	1.26
--- ZApp_CMFBase.py	25 Jan 2004 20:58:44 -0000	1.27
***************
*** 68,74 ****
      # src="http://hecxs.spvi.net:9180/HECPlone/fSystem/HECPlone/HEC/Media/Foods/clay.jpg"
  
!     _custom_skin_scripts = ('WHEN OBJECT CHANGED STORE portal_type using self.change(cmf_portal_type=self.portal_type)',
!                             "WITH SELF COMPUTE portal_object_id=_.getattr(self, 'zapp_portal_id')",
!                             "WITH SELF COMPUTE portal_object=_.getattr(self.findApplication(), self.portal_object_id)"
                              "WITH SELF COMPUTE graphic_url=self.findApplication().absolute_url() + ( '/fSystem/%s/%s/%s' % (self.getPhysicalPath()[1], self.portal_object_id, self.cmfdataid[1:].replace(',','/')))",
                              )
--- 68,73 ----
      # src="http://hecxs.spvi.net:9180/HECPlone/fSystem/HECPlone/HEC/Media/Foods/clay.jpg"
  
!     _custom_skin_scripts = ("WITH SELF COMPUTE portal_object_id=_.getattr(self, 'zapp_portal_id')",
!                             "WITH SELF COMPUTE portal_object=_.getattr(self.findApplication(), self.portal_object_id)",
                              "WITH SELF COMPUTE graphic_url=self.findApplication().absolute_url() + ( '/fSystem/%s/%s/%s' % (self.getPhysicalPath()[1], self.portal_object_id, self.cmfdataid[1:].replace(',','/')))",
                              )
***************
*** 277,281 ****
              safeStorage = mdm.getItem(safeStorageID)
              if safeStorage:
!                 self.ZAppCMF_afterAdd( safeStorage, newID )
                  safeStorage.manage_delete()
  
--- 276,280 ----
              safeStorage = mdm.getItem(safeStorageID)
              if safeStorage:
!                 self.ZAppCMF_afterAdd( safeStorage, newID)
                  safeStorage.manage_delete()
  

Index: ZApp_MiscData.py
===================================================================
RCS file: /cvsroot/zapp/ZApp/ZApp_MiscData.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** ZApp_MiscData.py	3 Jan 2004 03:13:48 -0000	1.25
--- ZApp_MiscData.py	25 Jan 2004 20:58:45 -0000	1.26
***************
*** 196,200 ****
          Get MiscData object associated with this object/Manager/dataType combination..
          """
- 
          Manager = (Manager or '') or self.miscDataManager
          localmdmKey = Manager + ":" + dataType
--- 196,199 ----
***************
*** 212,216 ****
                  mdResult = self.setupMiscData( Manager, dataType, checked=1)
  
!         return mdResult or None
  
      def setupMiscData(self, Manager=None, dataType='', checked=0):
--- 211,217 ----
                  mdResult = self.setupMiscData( Manager, dataType, checked=1)
  
!             return mdResult or None
! 
!         return mdm
  
      def setupMiscData(self, Manager=None, dataType='', checked=0):

Index: ZApp_Specialist.py
===================================================================
RCS file: /cvsroot/zapp/ZApp/ZApp_Specialist.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** ZApp_Specialist.py	9 Jan 2004 11:28:31 -0000	1.35
--- ZApp_Specialist.py	25 Jan 2004 20:58:45 -0000	1.36
***************
*** 622,626 ****
          return queryResult
  
!     def ZApp_getItemIds(self, conditions=None, displayQuery=0, createIfNone=0, **kw):
          """ Get all my itemIds that match conditions.. """
  
--- 622,626 ----
          return queryResult
  
!     def ZApp_getItemIds(self, conditions=None, displayQuery=0, createIfNone=0, REQUEST=None, **kw):
          """ Get all my itemIds that match conditions.. """
  
***************
*** 638,645 ****
          conditions.update(kw)
  
!         if not conditions:
              try:
!                 conditions.update(self.REQUEST.form)
!                 conditions.update(self.REQUEST.other)
              except:
                  conditions = {}
--- 638,645 ----
          conditions.update(kw)
  
!         if REQUEST is not None:
              try:
!                 conditions.update(self.REQUEST.form.copy())
!                 conditions.update(self.REQUEST.other.copy())
              except:
                  conditions = {}
***************
*** 669,679 ****
          return theIDs
  
!     def ZApp_getItems(self, conditions=None, createIfNone=0, displayQuery=0,  **kw):
          """ get my items that match conditions """
  
          results = []
  
!         if conditions == None:
!             conditions = self.REQUEST.form.copy()
  
          if kw:
--- 669,682 ----
          return theIDs
  
!     def ZApp_getItems(self, conditions=None, createIfNone=0, displayQuery=0, REQUEST=None, **kw):
          """ get my items that match conditions """
  
          results = []
  
!         if conditions is None:
!             conditions = {}
!             
!         if REQUEST is not None:  # only use the REQUEST if it is specifically passed in as an argument.
!             conditions.update(REQUEST.form.copy())
  
          if kw:

Index: __init__.py
===================================================================
RCS file: /cvsroot/zapp/ZApp/__init__.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** __init__.py	16 Jan 2004 09:55:34 -0000	1.20
--- __init__.py	25 Jan 2004 20:58:45 -0000	1.21
***************
*** 35,39 ****
  ModuleSecurityInfo('pdb').declarePublic('set_trace')
  ModuleSecurityInfo('urllib').declarePublic('urlencode', 'quote')
! ModuleSecurityInfo('xmlrpclib').declarePublic('Server')
  allow_module('Products.ZApp.ZApp_Utils')
  
--- 35,39 ----
  ModuleSecurityInfo('pdb').declarePublic('set_trace')
  ModuleSecurityInfo('urllib').declarePublic('urlencode', 'quote')
! ModuleSecurityInfo('xmlrpclib').declarePublic('Server', 'loads', 'dumps')
  allow_module('Products.ZApp.ZApp_Utils')