[Zapp-cvs-commit] ZApp/skins/zapp_generic zapp_cmf_object_edit.py,1.8,1.9 zapp_cmf_xml_edit.py,1.1,1
Brought to you by:
sspickle
|
From: <ssp...@pr...> - 2004-01-25 20:59:34
|
Update of /cvsroot/zapp/ZApp/skins/zapp_generic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17693/skins/zapp_generic Modified Files: zapp_cmf_object_edit.py zapp_cmf_xml_edit.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_cmf_object_edit.py =================================================================== RCS file: /cvsroot/zapp/ZApp/skins/zapp_generic/zapp_cmf_object_edit.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** zapp_cmf_object_edit.py 21 Jan 2004 12:26:48 -0000 1.8 --- zapp_cmf_object_edit.py 25 Jan 2004 20:58:46 -0000 1.9 *************** *** 39,43 **** submitValue = dict.get('submit','') ! for key in ['submit', 'zapp_dataType', 'zapp_misc_data_clear', 'redirect_url']: if dict.has_key(key): del dict[key] --- 39,43 ---- submitValue = dict.get('submit','') ! for key in ['submit', 'zapp_dataType', 'zapp_misc_data_clear', 'redirect_url', 'propToChange']: if dict.has_key(key): del dict[key] Index: zapp_cmf_xml_edit.py =================================================================== RCS file: /cvsroot/zapp/ZApp/skins/zapp_generic/zapp_cmf_xml_edit.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** zapp_cmf_xml_edit.py 20 Jan 2004 03:42:53 -0000 1.1 --- zapp_cmf_xml_edit.py 25 Jan 2004 20:58:46 -0000 1.2 *************** *** 5,9 **** ##bind script=script ##bind subpath=traverse_subpath ! ##parameters=xml, dataType="", no_redir=0, redirect_url='' ##title= ## --- 5,9 ---- ##bind script=script ##bind subpath=traverse_subpath ! ##parameters=xml, dataType="", no_redir=0, redirect_url='', clearFlag=0 ##title= ## *************** *** 12,21 **** """ miscData = context.getMiscData( dataType=dataType, createIfNone=1 ) if not miscData: raise RuntimeError, "Dang... can't find misc data object...." ! ! miscData.change( xml = xml ) if no_redir: --- 12,30 ---- """ + import xmlrpclib + miscData = context.getMiscData( dataType=dataType, createIfNone=1 ) if not miscData: raise RuntimeError, "Dang... can't find misc data object...." ! ! try: ! loadResult = xmlrpclib.loads(xml) ! args = loadResult[0] ! obj = args[0] ! except: ! raise RuntimeError, "Hmm.. can't seem to parse this XML" ! ! miscData.setXMLAttrs(dict = obj, zapp_misc_data_clear=clearFlag) if no_redir: |