Author: tdraier
Date: Mon Dec 31 12:04:52 2007
New Revision: 19432
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19432&repname=
=3Djahia
Log:
delete group membership when deleting site ( JAHIA-688 )
Modified:
trunk/core/src/java/org/jahia/hibernate/dao/JahiaSiteDAO.java
Modified: trunk/core/src/java/org/jahia/hibernate/dao/JahiaSiteDAO.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/dao/JahiaSiteDAO.java&rev=3D19432&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/dao/JahiaSiteDAO.java (original)
+++ trunk/core/src/java/org/jahia/hibernate/dao/JahiaSiteDAO.java Mon Dec 3=
1 12:04:52 2007
@@ -286,6 +286,7 @@
JahiaSitePropertyDAO sitePropertyDAO =3D (JahiaSitePropertyDAO) co=
ntext.getBean("jahiaSitePropertyDAO");
JahiaUserDAO userDAO =3D (JahiaUserDAO) context.getBean("jahiaUser=
DAO");
JahiaGroupDAO groupDAO =3D (JahiaGroupDAO) context.getBean("jahiaG=
roupDAO");
+ JahiaGroupAccessDAO groupAccessDAO =3D (JahiaGroupAccessDAO) conte=
xt.getBean("jahiaGroupAccessDAO");
JahiaSavedSearchDAO savedSearchDAO =3D (JahiaSavedSearchDAO) conte=
xt.getBean("jahiaSavedSearchDAO");
// We delete All fields
Map map =3D fieldsDataDAO.deleteAllFieldsFromSite(siteID);
@@ -360,6 +361,9 @@
}
}
// We delete all groups
+ for (Iterator iterator1 =3D groupDAO.getGroupKeys(siteID).iterator=
(); iterator1.hasNext();) {
+ groupAccessDAO.delete((String) iterator1.next());
+ }
groupDAO.deleteAllFromSite(siteID);
// We delete all users
userDAO.deleteAllFromSite(siteID);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
