[Zapp-cvs-commit] ZApp/skins/zapp_generic zapp_cmf_object_edit.py,1.6,1.7

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

Update of /cvsroot/zapp/ZApp/skins/zapp_generic
In directory sc8-pr-cvs1:/tmp/cvs-serv17345/skins/zapp_generic

Modified Files:
	zapp_cmf_object_edit.py 
Log Message:
adding some CMF features.. 

Index: zapp_cmf_object_edit.py
===================================================================
RCS file: /cvsroot/zapp/ZApp/skins/zapp_generic/zapp_cmf_object_edit.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** zapp_cmf_object_edit.py	8 Jan 2004 11:20:26 -0000	1.6
--- zapp_cmf_object_edit.py	12 Jan 2004 14:25:16 -0000	1.7
***************
*** 5,11 ****
  ##bind script=script
  ##bind subpath=traverse_subpath
! ##parameters=inputDict=None, redirect_url=None
  ##title=
  ##
  
  propDict = {'cmf_portal_type':getattr(context,'portal_type','unknown')}
--- 5,18 ----
  ##bind script=script
  ##bind subpath=traverse_subpath
! ##parameters=inputDict=None, redirect_url=None, no_redir=0
  ##title=
  ##
+ """
+ inputdict has all the state information about this object, or it could be in the REQUEST object.
+ 
+ redirect_url is where to go after executing
+ 
+ no_redir is true if no redirection is wanted.
+ """
  
  propDict = {'cmf_portal_type':getattr(context,'portal_type','unknown')}
***************
*** 18,31 ****
  context.manage_changeProperties(propDict)
      
- myApp = context.getApplication()
- myType = context.portal_type
- miscData = myApp.MiscData
- 
  cmfSpec = context.getMySpecialist()
- tpropObjects = miscData.ZApp_getItems(Manager=cmfSpec.getId(), objectID='metaObject', dataType='ZCMFPropsFor' + myType)
- myTPropsObj = tpropObjects and tpropObjects[0]
- myTPropDict = (myTPropsObj and myTPropsObj.getXMLDict()) or {}
- myTPropDefs = myTPropDict.get('zapp_properties',[])
- 
  import xmlrpclib
  
--- 25,29 ----
***************
*** 39,43 ****
  dataType = dict.get('zapp_dataType','')
  clearFlag = dict.get('zapp_misc_data_clear',0)
- 
  submitValue = dict.get('submit','')
  
--- 37,40 ----
***************
*** 61,73 ****
             currVal = currVal[:-1]
  
! for item in myTPropDefs:
!    propName = item.get('name')
!    propType = item.get('type')
!    if (propName in dict.keys()) and (propType == 'xml'):
!       inputValue = dict.get(propName,'')
!       if inputValue:
!          inputValue = xmlrpclib.loads(inputValue)
!          dict[propName] = inputValue[0][0]
  
  mdObject = context.getMiscData(dataType=dataType, createIfNone=1)
  mdObject.setXMLAttrs(dict = dict, zapp_misc_data_clear=clearFlag)
--- 58,78 ----
             currVal = currVal[:-1]
  
! if 0:
!     # I don't think anybody is using this anymore..... 
!     for item in myTPropDefs:
!        propName = item.get('name')
!        propType = item.get('type')
!        if (propName in dict.keys()) and (propType == 'xml'):
!           inputValue = dict.get(propName,'')
!           if inputValue:
!              inputValue = xmlrpclib.loads(inputValue)
!              dict[propName] = inputValue[0][0]
! 
! metadata = dict.get('metadata',None)
  
+ if metadata is not None:
+     del dict['metadata']
+     context.ZApp_handleMetaData( metadata=metadata )
+     
  mdObject = context.getMiscData(dataType=dataType, createIfNone=1)
  mdObject.setXMLAttrs(dict = dict, zapp_misc_data_clear=clearFlag)
***************
*** 77,80 ****
  if not redirect_url:
      redirect_url=context.absolute_url() + '/zapp_cmf_object_edit_form?portal_status_message=ZApp+CMF+Object+Changed.'
!     
! context.REQUEST.RESPONSE.redirect(redirect_url)
--- 82,89 ----
  if not redirect_url:
      redirect_url=context.absolute_url() + '/zapp_cmf_object_edit_form?portal_status_message=ZApp+CMF+Object+Changed.'
! 
! if no_redir:
!     return "OK!"
! else:
!     context.REQUEST.RESPONSE.redirect(redirect_url)
!     return "redirecting.. "