[Modeling-cvs] ZModeling/ZModelizationTool/dtml entity_properties.dtml,1.5,1.6 simpleRelationship_properties.dtml,1.3,1.4

[<sbi...@us...>]

Update of /cvsroot/modeling/ZModeling/ZModelizationTool/dtml
In directory sc8-pr-cvs1:/tmp/cvs-serv7471/ZModeling/ZModelizationTool/dtml

Modified Files:
	entity_properties.dtml simpleRelationship_properties.dtml 
Log Message:
Merged branch brch-0_9pre7-1-PyModel. Introducing: ability to express models
in plain python rather than in xml files.
See CHANGES for details.


Index: entity_properties.dtml
===================================================================
RCS file: /cvsroot/modeling/ZModeling/ZModelizationTool/dtml/entity_properties.dtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** entity_properties.dtml	22 Apr 2003 09:35:19 -0000	1.5
--- entity_properties.dtml	7 Jul 2003 14:57:15 -0000	1.6
***************
*** 252,258 ****
         </td>
         <td><i>
!         <dtml-if "deleteRule()==0">NULLIFY</dtml-if>
!         <dtml-if "deleteRule()==1">DENY</dtml-if>
!         <dtml-if "deleteRule()==2">CASCADE</dtml-if>
         </i></td>
         <td>
--- 252,256 ----
         </td>
         <td><i>
!         &nbsp;<dtml-var deleteRule>
         </i></td>
         <td>

Index: simpleRelationship_properties.dtml
===================================================================
RCS file: /cvsroot/modeling/ZModeling/ZModelizationTool/dtml/simpleRelationship_properties.dtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** simpleRelationship_properties.dtml	22 Apr 2003 09:35:23 -0000	1.3
--- simpleRelationship_properties.dtml	7 Jul 2003 14:57:15 -0000	1.4
***************
*** 113,122 ****
    <th valign=top>Delete rule</th>
    <td><div class="form-element">
!     <dtml-if "deleteRule()==0">
       <INPUT TYPE=RADIO NAME="deleteRule:int" value="0" CHECKED>
      <dtml-else><INPUT TYPE=RADIO NAME="deleteRule:int" value="0">
      </dtml-if>
      DELETE_NULLIFY<br>
!     <dtml-if "deleteRule()==1">
       <INPUT TYPE=RADIO NAME="deleteRule:int" value="1" CHECKED>
      <dtml-else>
--- 113,122 ----
    <th valign=top>Delete rule</th>
    <td><div class="form-element">
!     <dtml-if "deleteRule()=='nullify'">
       <INPUT TYPE=RADIO NAME="deleteRule:int" value="0" CHECKED>
      <dtml-else><INPUT TYPE=RADIO NAME="deleteRule:int" value="0">
      </dtml-if>
      DELETE_NULLIFY<br>
!     <dtml-if "deleteRule()=='deny'">
       <INPUT TYPE=RADIO NAME="deleteRule:int" value="1" CHECKED>
      <dtml-else>
***************
*** 124,128 ****
      </dtml-if>
      DELETE_DENY<br>
!     <dtml-if "deleteRule()==2">
       <INPUT TYPE=RADIO NAME="deleteRule:int" value="2" CHECKED>
      <dtml-else>
--- 124,128 ----
      </dtml-if>
      DELETE_DENY<br>
!     <dtml-if "deleteRule()=='cascade'">
       <INPUT TYPE=RADIO NAME="deleteRule:int" value="2" CHECKED>
      <dtml-else>