Update of
/var/cvs/contributions/didactor2/src/education/templates/editwizards/data/config/people
In directory james.mmbase.org:/tmp/cvs-serv2644
Modified Files:
people-education.xml people-list.xml people-related.xml
people-workgroup.xml people.xml people_unlink.xml
Log Message:
cleaning
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/editwizards/data/config/people
Index: people-education.xml
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/editwizards/data/config/people/people-education.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- people-education.xml 9 May 2006 15:37:04 -0000 1.6
+++ people-education.xml 7 Mar 2008 13:27:48 -0000 1.7
@@ -3,14 +3,8 @@
<title xml:lang="nl">Bijbehorende personen</title>
<title xml:lang="en">Related people</title>
<item>
- <field name="firstname" ftype="data">
- <prompt xml:lang="nl">Voornaam</prompt>
- <prompt xml:lang="en">Firstname</prompt>
- </field>
- <field fdatapath="object/[EMAIL PROTECTED]'lastname']" ftype="data">
- <prompt xml:lang="nl">Achternaam</prompt>
- <prompt xml:lang="en">Lastname</prompt>
- </field>
+ <field name="firstname" ftype="data" />
+ <field name="lastname" ftype="data" />
<field fdatapath="../[EMAIL PROTECTED]'related']/[EMAIL
PROTECTED]'roles']" ftype="data">
<prompt xml:lang="nl">Rol</prompt>
<prompt xml:lang="en">Role</prompt>
Index: people-list.xml
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/editwizards/data/config/people/people-list.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- people-list.xml 9 May 2006 15:37:04 -0000 1.6
+++ people-list.xml 7 Mar 2008 13:27:48 -0000 1.7
@@ -3,14 +3,8 @@
<title xml:lang="nl">Bijbehorende personen</title>
<title xml:lang="en">Related people</title>
<item>
- <field name="firstname" ftype="data">
- <prompt xml:lang="nl">Voornaam</prompt>
- <prompt xml:lang="en">Firstname</prompt>
- </field>
- <field name="lastname" ftype="data">
- <prompt xml:lang="nl">Achternaam</prompt>
- <prompt xml:lang="en">Lastname</prompt>
- </field>
+ <field name="firstname" ftype="data" />
+ <field name="lastname" ftype="data" />
<list extends="config/role/roles-inlist.xml"/>
<field wizardname="config/people/people" ftype="startwizard" />
</item>
Index: people-related.xml
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/editwizards/data/config/people/people-related.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- people-related.xml 16 Aug 2006 16:04:17 -0000 1.1
+++ people-related.xml 7 Mar 2008 13:27:48 -0000 1.2
@@ -3,14 +3,8 @@
<title xml:lang="nl">Bijbehorende personen</title>
<title xml:lang="en">Related people</title>
<item>
- <field name="firstname" ftype="data">
- <prompt xml:lang="nl">Voornaam</prompt>
- <prompt xml:lang="en">Firstname</prompt>
- </field>
- <field fdatapath="object/[EMAIL PROTECTED]'lastname']" ftype="data">
- <prompt xml:lang="nl">Achternaam</prompt>
- <prompt xml:lang="en">Lastname</prompt>
- </field>
+ <field name="firstname" ftype="data" />
+ <field name="lastname" ftype="data" />
<field fdatapath="../[EMAIL PROTECTED]'related']/[EMAIL
PROTECTED]'roles']" ftype="data">
<prompt xml:lang="nl">Rol</prompt>
<prompt xml:lang="en">Role</prompt>
Index: people-workgroup.xml
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/editwizards/data/config/people/people-workgroup.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- people-workgroup.xml 9 May 2006 15:37:04 -0000 1.6
+++ people-workgroup.xml 7 Mar 2008 13:27:48 -0000 1.7
@@ -3,14 +3,9 @@
<title xml:lang="nl">Bijbehorende personen</title>
<title xml:lang="en">Related people</title>
<item>
- <field name="firstname" ftype="data">
- <prompt xml:lang="nl">Voornaam</prompt>
- <prompt xml:lang="en">Firstname</prompt>
- </field>
- <field fdatapath="object/[EMAIL PROTECTED]'lastname']" ftype="data">
- <prompt xml:lang="nl">Achternaam</prompt>
- <prompt xml:lang="en">Lastname</prompt>
- </field>
+ <field name="firstname" ftype="data" />
+ <field name="lastname" ftype="data" />
+
<field fdatapath="../[EMAIL PROTECTED]'related']/[EMAIL
PROTECTED]'roles']" ftype="data">
<prompt xml:lang="nl">Rol</prompt>
<prompt xml:lang="en">Role</prompt>
Index: people.xml
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/editwizards/data/config/people/people.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- people.xml 7 Jun 2007 09:24:06 -0000 1.16
+++ people.xml 7 Mar 2008 13:27:48 -0000 1.17
@@ -22,15 +22,8 @@
&extra_loads;
</action>
- <action type="delete">
+ <action type="delete" />
- </action>
-
-
- <lists>
- <optionlist include="config/option_list/enabled.xml" />
- <optionlist include="config/option_list/gender.xml" />
- </lists>
<form-schema id="step1">
<title xml:lang="nl">Persoon invoeren</title>
@@ -39,9 +32,7 @@
<field name="initials" />
<field name="suffix" ftype="line" />
<field name="lastname" />
- <field name="gender" ftype="enum">
- <optionlist select="gender" />
- </field>
+ <field name="gender" />
<field name="address" />
<field name="zipcode" />
<field name="city" />
@@ -55,9 +46,7 @@
<field name="password" />
<field name="remarks" ftype="line" />
<field name="description" rows="8" ftype="text" />
- <field name="person_status" ftype="enum">
- <optionlist select="enabled" />
- </field>
+ <field name="person_status" />
<list extends="config/role/roles-list.xml" />
<list extends="config/workgroup/workgroups-list.xml" />
Index: people_unlink.xml
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/editwizards/data/config/people/people_unlink.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- people_unlink.xml 7 Jun 2007 09:24:06 -0000 1.2
+++ people_unlink.xml 7 Mar 2008 13:27:48 -0000 1.3
@@ -10,7 +10,10 @@
<title xml:lang="en">People editor</title>
<action type="create">
- <object type="people"/>
+ <object type="people">
+ <relation role="related" destination="$origin" />
+ <relation role="classrel" destination="$education" />
+ </object>
</action>
<action type="load">
@@ -26,12 +29,6 @@
</action>
-
- <lists>
- <optionlist include="config/option_list/enabled.xml" />
- <optionlist include="config/option_list/gender.xml" />
- </lists>
-
<form-schema id="step1">
<title xml:lang="nl">Persoon invoeren</title>
<title xml:lang="en">Enter person</title>
@@ -39,9 +36,7 @@
<field name="initials" />
<field name="suffix" ftype="line" />
<field name="lastname" />
- <field name="gender" ftype="enum">
- <optionlist select="gender" />
- </field>
+ <field name="gender" />
<field name="address" />
<field name="zipcode" />
<field name="city" />
@@ -55,9 +50,7 @@
<field name="password" />
<field name="remarks" ftype="line" />
<field name="description" rows="8" ftype="text" />
- <field name="person_status" ftype="enum">
- <optionlist select="enabled" />
- </field>
+ <field name="person_status" />
<list extends="config/role/roles-list.xml" />
<list extends="config/workgroup/workgroups-list.xml" />
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
