Author: tdraier
Date: Mon Jun 25 14:55:35 2007
New Revision: 17743
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17743&repname=
=3Djahia
Log:
fixed cascae definition and allows correect deletion of definitions (JAHIA-=
1912) ( backport 17395 )
Modified:
trunk/core/src/java/org/jahia/hibernate/dao/JahiaFieldsDefinitionDAO.ja=
va
trunk/core/src/java/org/jahia/hibernate/model/JahiaFieldsDef.java
Modified: trunk/core/src/java/org/jahia/hibernate/dao/JahiaFieldsDefinition=
DAO.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/dao/JahiaFieldsDefinitionDAO.java&rev=3D17743&repname=3D=
jahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/hibernate/dao/JahiaFieldsDefinitionDAO.ja=
va (original)
+++ trunk/core/src/java/org/jahia/hibernate/dao/JahiaFieldsDefinitionDAO.ja=
va Mon Jun 25 14:55:35 2007
@@ -163,7 +163,7 @@
template.deleteAll(template.find("from JahiaFieldsDef def =
where def.id=3D?",fieldsDefId));
template.flush();
} catch (Throwable e) {
- ;
+ logger.error("Cannot delete definition",e);
}
map.add(new FieldDefinitionKey(fieldsDefId.intValue()));
}
Modified: trunk/core/src/java/org/jahia/hibernate/model/JahiaFieldsDef.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/model/JahiaFieldsDef.java&rev=3D17743&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/hibernate/model/JahiaFieldsDef.java (orig=
inal)
+++ trunk/core/src/java/org/jahia/hibernate/model/JahiaFieldsDef.java Mon J=
un 25 14:55:35 2007
@@ -107,7 +107,7 @@
this.name =3D name;
}
/**
- * @hibernate.map lazy=3D"true" inverse=3D"true" cascade=3D"all" table=
=3D"jahia_fields_def_extprop"
+ * @hibernate.map lazy=3D"true" inverse=3D"true" cascade=3D"save-updat=
e" table=3D"jahia_fields_def_extprop"
* @hibernate.collection-key column=3D"id_jahia_fields_def" type=3D"in=
t"
* @hibernate.collection-index column=3D"prop_name" type=3D"string"
* @hibernate.collection-element column=3D"prop_value" type=3D"string"
@@ -122,9 +122,7 @@
this.properties =3D properties;
}
/**
- * @hibernate.set lazy=3D"true"
- * inverse=3D"false"
- * cascade=3D"all"
+ * @hibernate.set lazy=3D"true" inverse=3D"false" cascade=3D"save-upda=
te"
* @hibernate.collection-key column=3D"flddefid_jahia_fields_def_prop"
* @hibernate.collection-one-to-many class=3D"org.jahia.hibernate.mode=
l.JahiaFieldsDefProp"
* @hibernate.collection-cache usage=3D"nonstrict-read-write"
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
