[Zapp-cvs-commit] ZApp/skins/zapp_generic .cvsignore,1.1,1.2 zapp_cmf_object_test.py,1.1,1.2 zapp_cm
Brought to you by:
sspickle
Menu
▾
▴
[Zapp-cvs-commit] ZApp/skins/zapp_generic .cvsignore,1.1,1.2 zapp_cmf_object_test.py,1.1,1.2 zapp_cmf_sub_contents.zpt,1.1,1.2 zapp_cmf_object_edit.py,1.3,1.4 zapp_cmf_object_edit_form.pt,1.3,1.4 zapp_cmf_object_type_edit.py,1.3,1.4 zapp_cmf_object_type_edit_form.pt,1.4,1.5 zapp_cmf_object_view.pt,1.4,1.5
|
From: <ssp...@us...> - 2003-10-28 20:29:25
|
Update of /cvsroot/zapp/ZApp/skins/zapp_generic
In directory sc8-pr-cvs1:/tmp/cvs-serv28855/skins/zapp_generic
Modified Files:
zapp_cmf_object_edit.py zapp_cmf_object_edit_form.pt
zapp_cmf_object_type_edit.py zapp_cmf_object_type_edit_form.pt
zapp_cmf_object_view.pt
Added Files:
.cvsignore zapp_cmf_object_test.py zapp_cmf_sub_contents.zpt
Log Message:
attempt to merge new CMF relations back to main branch
Index: zapp_cmf_object_edit.py
===================================================================
RCS file: /cvsroot/zapp/ZApp/skins/zapp_generic/zapp_cmf_object_edit.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** zapp_cmf_object_edit.py 28 Aug 2003 17:38:48 -0000 1.3
--- zapp_cmf_object_edit.py 28 Oct 2003 20:27:04 -0000 1.4
***************
*** 8,15 ****
##title=
##
myApp = context.getApplication()
myType = context.portal_type
miscData = myApp.MiscData
! tpropObjects = miscData.ZApp_getItems(Manager='CMFThings', objectID='metaObject', dataType='ZCMFPropsFor' + myType)
myTPropsObj = tpropObjects and tpropObjects[0]
myTPropDict = (myTPropsObj and myTPropsObj.getXMLDict()) or {}
--- 8,22 ----
##title=
##
+
+ title=context.REQUEST.get('title',None)
+ if title is not None:
+ context.manage_changeProperties(title=title)
+
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 {}
***************
*** 53,55 ****
context.safeMiscData.setXMLAttrs(dict = dict)
! context.REQUEST.RESPONSE.redirect('zapp_cmf_object_edit_form')
--- 60,62 ----
context.safeMiscData.setXMLAttrs(dict = dict)
! context.REQUEST.RESPONSE.redirect('zapp_cmf_object_edit_form?portal_status_message=ZApp+CMF+Object+Changed.')
Index: zapp_cmf_object_edit_form.pt
===================================================================
RCS file: /cvsroot/zapp/ZApp/skins/zapp_generic/zapp_cmf_object_edit_form.pt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** zapp_cmf_object_edit_form.pt 18 Aug 2003 13:38:09 -0000 1.3
--- zapp_cmf_object_edit_form.pt 28 Oct 2003 20:27:04 -0000 1.4
***************
*** 29,34 ****
<div tal:define="myApp python:here.getApplication();
myType here/portal_type;
miscDataSpecialist myApp/MiscData;
! typePropertiesObjects python:miscDataSpecialist.ZApp_getItems(Manager='CMFThings', objectID='metaObject', dataType='ZCMFPropsFor' + myType);
myTPropsMiscData python:typePropertiesObjects and typePropertiesObjects[0].getXMLDict();
myPropSet myTPropsMiscData/zapp_properties | nothing;
--- 29,35 ----
<div tal:define="myApp python:here.getApplication();
myType here/portal_type;
+ cmfSpec python:here.getMySpecialist();
miscDataSpecialist myApp/MiscData;
! typePropertiesObjects python:miscDataSpecialist.ZApp_getItems(Manager=cmfSpec.getId(), objectID='metaObject', dataType='ZCMFPropsFor' + myType);
myTPropsMiscData python:typePropertiesObjects and typePropertiesObjects[0].getXMLDict();
myPropSet myTPropsMiscData/zapp_properties | nothing;
***************
*** 36,43 ****
<table tal:condition="myPropSet">
! <form action="zapp_cmf_object_edit" method="post">
<tr tal:repeat="propDef myPropSet">
! <td tal:define="propName propDef/name;
! propType propDef/type;
subObject propDef/subObject | python:[];
subDefs subObject/zapp_properties | python:[];
--- 37,45 ----
<table tal:condition="myPropSet">
! <form action="." tal:attributes="action string:${here/getId}/zapp_cmf_object_edit" method="post">
! <tr><td>Title: <input name="title" size="20" value="" tal:attributes="value here/title"/></td></tr>
<tr tal:repeat="propDef myPropSet">
! <td tal:define="propName propDef/name;
! propType propDef/type;
subObject propDef/subObject | python:[];
subDefs subObject/zapp_properties | python:[];
Index: zapp_cmf_object_type_edit.py
===================================================================
RCS file: /cvsroot/zapp/ZApp/skins/zapp_generic/zapp_cmf_object_type_edit.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** zapp_cmf_object_type_edit.py 28 Aug 2003 17:38:48 -0000 1.3
--- zapp_cmf_object_type_edit.py 28 Oct 2003 20:27:04 -0000 1.4
***************
*** 11,15 ****
myType = context.portal_type
miscData = myApp.MiscData
! tpropObjects = miscData.ZApp_getItems(Manager='CMFThings', objectID='metaObject', dataType='ZCMFPropsFor' + myType)
myTPropsObj = tpropObjects and tpropObjects[0]
myTPropDict = (myTPropsObj and myTPropsObj.getXMLDict()) or {}
--- 11,16 ----
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 {}
***************
*** 126,130 ****
if not myTPropsObj:
! tpropObjects = miscData.ZApp_getItems(Manager='CMFThings', objectID='metaObject', dataType='ZCMFPropsFor' + myType, createIfNone=1)
myTPropsObj = tpropObjects and tpropObjects[0]
if not myTPropsObj:
--- 127,131 ----
if not myTPropsObj:
! tpropObjects = miscData.ZApp_getItems(Manager=cmfSpec.getId(), objectID='metaObject', dataType='ZCMFPropsFor' + myType, createIfNone=1)
myTPropsObj = tpropObjects and tpropObjects[0]
if not myTPropsObj:
***************
*** 133,135 ****
myTPropsObj.setXMLAttrs({'zapp_properties': myTPropDefs})
! context.REQUEST.RESPONSE.redirect('zapp_cmf_object_type_edit_form')
--- 134,136 ----
myTPropsObj.setXMLAttrs({'zapp_properties': myTPropDefs})
! context.REQUEST.RESPONSE.redirect(context.absolute_url() + '/zapp_cmf_object_type_edit_form')
Index: zapp_cmf_object_type_edit_form.pt
===================================================================
RCS file: /cvsroot/zapp/ZApp/skins/zapp_generic/zapp_cmf_object_type_edit_form.pt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** zapp_cmf_object_type_edit_form.pt 18 Aug 2003 13:38:09 -0000 1.4
--- zapp_cmf_object_type_edit_form.pt 28 Oct 2003 20:27:04 -0000 1.5
***************
*** 54,63 ****
<div tal:define="myApp python:here.getApplication();
myType here/portal_type;
miscDataSpecialist myApp/MiscData;
! typePropertiesObjects python:miscDataSpecialist.ZApp_getItems(Manager='CMFThings', objectID='metaObject', dataType='ZCMFPropsFor' + myType);
! myTPropsMiscData python:typePropertiesObjects and typePropertiesObjects[0].getXMLDict();
myPropSet myTPropsMiscData/zapp_properties | nothing">
! <form action="zapp_cmf_object_type_edit" method="post">
<table tal:condition="myPropSet">
<tr tal:repeat="propDef myPropSet">
--- 54,64 ----
<div tal:define="myApp python:here.getApplication();
myType here/portal_type;
+ cmfSpec python:here.getMySpecialist();
miscDataSpecialist myApp/MiscData;
! typePropertiesObjects python:miscDataSpecialist.ZApp_getItems(Manager=cmfSpec.getId(), objectID='metaObject', dataType='ZCMFPropsFor' + myType);
! myTPropsMiscData python:typePropertiesObjects and typePropertiesObjects[0].getXMLDict();
myPropSet myTPropsMiscData/zapp_properties | nothing">
! <form action="." tal:attributes="action string:${here/getId}/zapp_cmf_object_type_edit" method="post">
<table tal:condition="myPropSet">
<tr tal:repeat="propDef myPropSet">
Index: zapp_cmf_object_view.pt
===================================================================
RCS file: /cvsroot/zapp/ZApp/skins/zapp_generic/zapp_cmf_object_view.pt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** zapp_cmf_object_view.pt 7 Aug 2003 13:50:32 -0000 1.4
--- zapp_cmf_object_view.pt 28 Oct 2003 20:27:04 -0000 1.5
***************
*** 11,17 ****
<div tal:define="myApp python:here.getApplication();
myType here/portal_type;
miscDataSpecialist myApp/MiscData;
! typePropertiesObjects python:miscDataSpecialist.ZApp_getItems(Manager='CMFThings', objectID='metaObject', dataType='ZCMFPropsFor' + myType);
! myTypePropertiesMiscData python:typePropertiesObjects and typePropertiesObjects[0].getXMLDict();
myProperties python:here.safeMiscData.getXMLDict()">
--- 11,19 ----
<div tal:define="myApp python:here.getApplication();
myType here/portal_type;
+ cmfSpec python:here.getMySpecialist();
miscDataSpecialist myApp/MiscData;
! typePropertiesObjects python:miscDataSpecialist.ZApp_getItems(Manager=cmfSpec.getId(), objectID='metaObject', dataType='ZCMFPropsFor' + myType);
! myTypePropertiesMiscData python:typePropertiesObjects and typePropertiesObjects[0].getXMLDict();
! myPropSet myTypePropertiesMiscData/zapp_properties | nothing;
myProperties python:here.safeMiscData.getXMLDict()">
|
