[Zapp-cvs-commit] ZApp ZApp_Application.py,1.22,1.23 ZApp_RelatableItem.py,1.17,1.18

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

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

Modified Files:
	ZApp_Application.py ZApp_RelatableItem.py 
Log Message:
fixed bug in removeObjectRelations if there are none.. 

Index: ZApp_Application.py
===================================================================
RCS file: /cvsroot/zapp/ZApp/ZApp_Application.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** ZApp_Application.py	7 Aug 2003 13:50:32 -0000	1.22
--- ZApp_Application.py	12 Aug 2003 13:32:13 -0000	1.23
***************
*** 250,254 ****
  
          return results
!     
      def localeID(self):
          return getattr(self, 'LOCALE_ID', 'TST')
--- 250,272 ----
  
          return results
! 
!     SDT = 'SESSION_DATA_TYPE'
! 
!     def getUserSessions(self, browserID=None, create=0):
!         """
!         return the current session info object(s)
!         """
! 
!         conditions = {
!             'dataType':self.SDT,
!             'Manager':'SessionData',
!             'objectID':self.REQUEST.AUTHENTICATED_USER.getUserName(),
!             }
! 
!         if browserID is not None:
!             conditions.update({'xml':'<xmlData browserID="%s"/>' % browserID})
!             
!         return self.MiscData.ZApp_getItems(conditions=conditions, createIfNone=create)
! 
      def localeID(self):
          return getattr(self, 'LOCALE_ID', 'TST')

Index: ZApp_RelatableItem.py
===================================================================
RCS file: /cvsroot/zapp/ZApp/ZApp_RelatableItem.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ZApp_RelatableItem.py	3 Jul 2003 18:05:07 -0000	1.17
--- ZApp_RelatableItem.py	12 Aug 2003 13:32:13 -0000	1.18
***************
*** 355,359 ****
              ids = [x['selfRIID'] for x in self.objectRelations()]
  
!         self.getRelationshipManager().removeObjectRelations( ids )
  
      def removeObjectRelations_ui(self, ids, REQUEST=None):
--- 355,360 ----
              ids = [x['selfRIID'] for x in self.objectRelations()]
  
!         if ids:
!             self.getRelationshipManager().removeObjectRelations( ids )
  
      def removeObjectRelations_ui(self, ids, REQUEST=None):