[Zapp-cvs-commit] ZApp ZApp_LeverMethods.py,1.9,1.10 ZApp_RelatableItem.py,1.16,1.17 ZApp_RelationshipManager.py,1.2,1.3 ZApp_Specialist.py,1.28,1.29

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

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

Modified Files:
	ZApp_LeverMethods.py ZApp_RelatableItem.py 
	ZApp_RelationshipManager.py ZApp_Specialist.py 
Log Message:
fixed some ZApp bugs.. 

Index: ZApp_LeverMethods.py
===================================================================
RCS file: /cvsroot/zapp/ZApp/ZApp_LeverMethods.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ZApp_LeverMethods.py	28 Mar 2003 20:38:23 -0000	1.9
--- ZApp_LeverMethods.py	3 Jul 2003 18:05:07 -0000	1.10
***************
*** 215,219 ****
          return a list of avaiable lever set ids..
          """
!         return [''] + map(lambda x: x.getId(),  self.findZApp_Application().getLeverSetsFromList())
  
  def initialize(context):
--- 215,219 ----
          return a list of avaiable lever set ids..
          """
!         return [''] + map(lambda x: x.getId(),  self.findZApp_Application().getLeverSetsFromList( exclude=''))
  
  def initialize(context):

Index: ZApp_RelatableItem.py
===================================================================
RCS file: /cvsroot/zapp/ZApp/ZApp_RelatableItem.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ZApp_RelatableItem.py	1 Jul 2003 22:22:03 -0000	1.16
--- ZApp_RelatableItem.py	3 Jul 2003 18:05:07 -0000	1.17
***************
*** 262,265 ****
--- 262,266 ----
          "WITH self.getObjectType() COMPUTE objectType=RESULT",
          "WITH self.getObjectManagerID() COMPUTE Manager=RESULT",
+         "WHEN OBJECT DELETED CALL self.removeObjectRelations()",
          )
  
***************
*** 284,305 ****
          return result
  
!     def createAndAddObject_ui(self, objectProperties=None, objectManager=None, objectRole=None, selfRole=None, createIfNone=0, contextID='', **kw):
          """
          A UI method to create and add an object..
          """
!         if objectProperties is None:
!             objectProperties = {}
              
          if kw:
!             objectProperties.update(kw)
  
!         self.createAndAddObject(objectProperties=objectProperties, objectManager=objectManager, objectRole=objectRole, selfRole=selfRole, createIfNone=createIfNone, contextID=contextID)
  
!         responseURL = self.REQUEST.get('responseURL',None)
          
!         if responseURL:
!             self.REQUEST.RESPONSE.redirect(responseURL)
! 
!         return "OK!"
  
      def createAndAddObject(self, objectProperties=None, objectManager=None, objectRole=None, selfRole=None, createIfNone=0, contextID='',  **kw):
--- 285,311 ----
          return result
  
!     def createAndAddObject_ui(self, objectProperties=None, objectManager=None, objectRole=None, selfRole=None, createIfNone=0, contextID='', REQUEST=None, **kw):
          """
          A UI method to create and add an object..
          """
! 
!         cond = {}
!         
!         if objectProperties is not None:
!             for k in objectProperties.keys():
!                 cond[k] = objectProperties[k]
              
          if kw:
!             cond.update(kw)
  
!         self.createAndAddObject(objectProperties=cond, objectManager=objectManager, objectRole=objectRole, selfRole=selfRole, createIfNone=createIfNone, contextID=contextID)
  
!         if REQUEST is not None:
!             responseURL = REQUEST.get('responseURL',None)
          
!             if responseURL:
!                 REQUEST.RESPONSE.redirect(responseURL)
!             else:
!                 self.displayUpdateForm_html(self, REQUEST)
  
      def createAndAddObject(self, objectProperties=None, objectManager=None, objectRole=None, selfRole=None, createIfNone=0, contextID='',  **kw):
***************
*** 323,326 ****
--- 329,333 ----
          if not theObject:
              theObject = theManager.ZApp_createNewItem( objectProperties )
+             
          self.addObject( otherObject=theObject, objectRole=objectRole, selfRole=selfRole, createIfNone=createIfNone, contextID=contextID)
          return theObject
***************
*** 337,354 ****
          rm.relateObjects( object1=self, object1Role=selfRole, object2=otherObject, object2Role=objectRole, createIfNone=createIfNone, contextID=contextID)
  
!     def removeObjectRelations(self, relationshipIDs):
          """
          remove the relationships with the given relationship IDs..
          """
-         self.getRelationshipManager().removeObjectRelations( relationshipIDs)
  
!     def removeObjectRelations_ui(self, relationshipIDs, REQUEST=None):
!         """
!         remove the relationships with the given relationship IDs.. + UI fluff.. 
!         """
!         if relationshipIDs:
  
!             self.removeObjectRelations( relationshipIDs )
  
              if REQUEST is not None:
                  responseURL = self.REQUEST.get('responseURL',None)
--- 344,368 ----
          rm.relateObjects( object1=self, object1Role=selfRole, object2=otherObject, object2Role=objectRole, createIfNone=createIfNone, contextID=contextID)
  
!     def removeObjectRelations(self, ids=None):
          """
          remove the relationships with the given relationship IDs..
          """
  
!         if ids is None:
!             """
!             Special case... this deletes all the relationships in which this object participates.
!             """
!             ids = [x['selfRIID'] for x in self.objectRelations()]
  
!         self.getRelationshipManager().removeObjectRelations( ids )
  
+     def removeObjectRelations_ui(self, ids, REQUEST=None):
+         """
+         remove the relationships with the given relationship IDs.. + UI fluff..
+ 
+         this method requires ids to be passed... 
+         """
+         if ids:
+             self.removeObjectRelations( ids )
              if REQUEST is not None:
                  responseURL = self.REQUEST.get('responseURL',None)
***************
*** 357,361 ****
                      self.REQUEST.RESPONSE.redirect(responseURL)
                      
!                 return self.manage_main(self, REQUEST)
          else:
              raise RuntimeError, "I need some ids!"
--- 371,375 ----
                      self.REQUEST.RESPONSE.redirect(responseURL)
                      
!                 return self.displayUpdateForm_html(self, REQUEST)
          else:
              raise RuntimeError, "I need some ids!"
***************
*** 432,436 ****
              raise RuntimeError, "No relationship info provided.. "
  
!         rItemMan = self.getRelationshipItemManager()
          
          for relInfo in relationInfo:
--- 446,450 ----
              raise RuntimeError, "No relationship info provided.. "
  
!         rItemMan = self.getRelationshipManager().getRelationshipItemManager()
          
          for relInfo in relationInfo:
***************
*** 447,451 ****
                  self.REQUEST.RESPONSE.redirect(responseURL)
  
!             return self.manage_main(self, REQUEST)
      
      def nextContextID(self, objectTypes=None, objectRoles=None, selfRoles=None):
--- 461,465 ----
                  self.REQUEST.RESPONSE.redirect(responseURL)
  
!             return self.displayUpdateForm_html(self, REQUEST)
      
      def nextContextID(self, objectTypes=None, objectRoles=None, selfRoles=None):

Index: ZApp_RelationshipManager.py
===================================================================
RCS file: /cvsroot/zapp/ZApp/ZApp_RelationshipManager.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ZApp_RelationshipManager.py	1 Jul 2003 22:22:03 -0000	1.2
--- ZApp_RelationshipManager.py	3 Jul 2003 18:05:07 -0000	1.3
***************
*** 68,81 ****
          rItem2 = relItems.ZApp_createNewItem(relationshipID=newR.id, objectID=object2.id, objectManager=object2.Manager, roleID=role2ID, contextID=contextID)
  
-     def removeObjectRelations(self, relationshipIDs):
-         """
-         remove the relationships with the given relationship IDs..
-         """
- 
-         rItemsMan = self.getRelationshipItemManager()
- 
-         for rItem in rItemsMan.ZApp_getItems( relationshipID = relationshipIDs):
-             rItem.manage_delete()
-             
      def removeObjects(self, object1, object2=None, object1Role=None, object2Role=None, object2Type=None, object2Manager=None):
          """
--- 68,71 ----
***************
*** 108,116 ****
              role2ID = role2IDs and role2IDs[0]
  
!         relationshipIDs = []
!         for rItem1 in rItemsMan.ZApp_getItems(objectID=object1.id, objectManager=object1.Manager, roleID=role1ID):
              theRID=rItem1.relationshipID
!             for rItem2 in rItemsMan.ZApp_getItems(relationshipID=rItem1.relationshipID, objectManager=o2Manager, roleID=role2ID):
!                 if (not ((rItem2.objectID == object1.id) and (rItem2.objectManager == object2.Manager))):
                      rItem2.manage_delete()
  
--- 98,128 ----
              role2ID = role2IDs and role2IDs[0]
  
!         rItems = rItemsMan.ZApp_getItems(objectID=object1.id, objectManager=object1.Manager, roleID=role1ID)
! 
!         self.removeObjectRelations( rItems = rItems, role1ID = role1ID, role2ID = role2ID, o2Type = o2Type, o2Manager = o2Manager)
! 
!     def removeObjectRelations(self, rItemIDs=None, rItems=None, role1ID='', role2ID='', o2Type='', o2Manager=''):
!         """
!         remove the relationships with the given relationship items, or relationship item ids.. 
!         """
! 
!         rItemsMan = self.getRelationshipItemManager()
! 
!         if not rItems:
!             if not rItemIDs:
!                 raise RuntimeError, "remove object relations needs either items or itemIDs.. "
!             
!             rItems = rItemsMan.ZApp_getItems( relationshipItemID = rItemIDs )
! 
!         for rItem1 in rItems:
              theRID=rItem1.relationshipID
!             for rItem2 in rItemsMan.ZApp_getItems(relationshipID=theRID, objectManager=o2Manager, roleID=role2ID):
!                 if rItem2.id != rItem1.id:
!                     if o2Type:
!                         theObject = rItem2.getObject()
!                         if theObject:
!                             if theObject.objectType != o2Type:
!                                 continue
!                             
                      rItem2.manage_delete()
  

Index: ZApp_Specialist.py
===================================================================
RCS file: /cvsroot/zapp/ZApp/ZApp_Specialist.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** ZApp_Specialist.py	30 Jun 2003 20:25:05 -0000	1.28
--- ZApp_Specialist.py	3 Jul 2003 18:05:07 -0000	1.29
***************
*** 10,13 ****
--- 10,15 ----
  from ZApp_LOG import ZApp_LOG
  
+ from DateTime import DateTime
+ 
  from copy import copy
  import string
***************
*** 187,196 ****
          """ Clean up a date """ 
  
-         import DateTime
- 
          if theDate.year() > 1100:
              return theDate
          else:
!             now = DateTime.DateTime()
  
              return "%i/%i/%i" % (now.year(), now.month(), now.day())
--- 189,196 ----
          """ Clean up a date """ 
  
          if theDate.year() > 1100:
              return theDate
          else:
!             now = DateTime()
  
              return "%i/%i/%i" % (now.year(), now.month(), now.day())
***************
*** 464,468 ****
              itemType = item['type']
              mode = item.get('mode','')
!             defaultVal = item.get('prop_default','')
              if itemID not in ('title','id'):
                  theType = typeTable.get(itemType,'')
--- 464,474 ----
              itemType = item['type']
              mode = item.get('mode','')
!             init_method = item.get('form_init_method','')
!             
!             if init_method:
!                 defaultVal = eval( init_method )
!             else:
!                 defaultVal = item.get('prop_default','')
!                 
              if itemID not in ('title','id'):
                  theType = typeTable.get(itemType,'')
***************
*** 716,720 ****
          return self.manage_main(self,REQUEST,update_menu=1)
  
! def initialize(context, subClass=ZApp_Specialist, addMethod=manage_addZApp_Specialist, addForm=manage_addZApp_Specialist):
  
      context.registerClass(
--- 722,726 ----
          return self.manage_main(self,REQUEST,update_menu=1)
  
! def initialize(context, subClass=ZApp_Specialist, addMethod=manage_addZApp_Specialist, addForm=manage_addZApp_SpecialistForm):
  
      context.registerClass(