X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.entity.api%2Fsrc%2Forg%2Fargeo%2Fentity%2Fentity.cnd;h=46b3f07d186322dd5f19500b8e504732149ae789;hb=65030067b0125a4399f58b897b78debded2984d3;hp=45be8adee863bbf59498f0f57c4127944e5e39d7;hpb=8630eb1e679307eb8a8448f80a99cc530402d8d3;p=gpl%2Fargeo-suite.git

diff --git a/org.argeo.entity.api/src/org/argeo/entity/entity.cnd b/org.argeo.entity.api/src/org/argeo/entity/entity.cnd
index 45be8ad..46b3f07 100644
--- a/org.argeo.entity.api/src/org/argeo/entity/entity.cnd
+++ b/org.argeo.entity.api/src/org/argeo/entity/entity.cnd
@@ -15,12 +15,12 @@ mixin
 //
 // ENTITY DEFINITION
 //
-[entity:definition] > entity:composite, mix:created, mix:referenceable
+[entity:definition] > entity:composite, mix:created, mix:lastModified, mix:referenceable
 //- entity:type (String) multiple
 
-[entity:part]
+//[entity:part]
 
-[entity:reference]
+//[entity:reference]
 
 [entity:composite]
 orderable
@@ -31,13 +31,18 @@ orderable
 //
 // TYPOLOGY
 //
+[entity:typologies]
++ * (entity:terms) = entity:terms
+
 [entity:term]
 orderable
-+ * (entity:term) *
+- name (NAME) m
+- * (*)
++ term (entity:term) = entity:term *
 
-[entity:typology] > mix:referenceable, mix:created
+[entity:terms] > mix:referenceable
 orderable
-+ * (entity:term) *
++ term (entity:term) = entity:term *
 
 //
 // FORM
@@ -45,7 +50,10 @@ orderable
 [entity:form]
 mixin
 
-[entity:formSet]
+[entity:formSubmission]
+mixin
+
+[entity:formSet] > mix:title
 mixin
 
 // LDAP-LIKE ENTITIES