diff --git a/ccm-cms/application.xml b/ccm-cms/application.xml index f362e42cf..015c5077c 100755 --- a/ccm-cms/application.xml +++ b/ccm-cms/application.xml @@ -2,7 +2,7 @@ diff --git a/ccm-cms/pdl/com/arsdigita/content-section/RelationAttribute.pdl b/ccm-cms/pdl/com/arsdigita/content-section/RelationAttribute.pdl index 2b02049c7..7bead87a8 100644 --- a/ccm-cms/pdl/com/arsdigita/content-section/RelationAttribute.pdl +++ b/ccm-cms/pdl/com/arsdigita/content-section/RelationAttribute.pdl @@ -21,9 +21,9 @@ model com.arsdigita.cms; import com.arsdigita.kernel.ACSObject; -object type RelationAttribute { +object type RelationAttribute extends ACSObject { - BigDecimal[1..1] id = cms_relation_attribute.object_id INTEGER; + //BigDecimal[1..1] id = cms_relation_attribute.object_id INTEGER; String[1..1] attribute = cms_relation_attribute.attribute VARCHAR(100); String[1..1] attr_key = cms_relation_attribute.attr_key VARCHAR(100); String[1..1] lang = cms_relation_attribute.lang VARCHAR(2); @@ -31,6 +31,7 @@ object type RelationAttribute { String[0..1] description = cms_relation_attribute.description VARCHAR(500); unique (attribute, attr_key, lang); - object key (id); + //object key (id); + reference key(cms_relation_attribute.object_id); } diff --git a/ccm-cms/src/ccm-cms.upgrade b/ccm-cms/src/ccm-cms.upgrade index ec1366497..68f777d85 100755 --- a/ccm-cms/src/ccm-cms.upgrade +++ b/ccm-cms/src/ccm-cms.upgrade @@ -69,4 +69,8 @@