cmailleux 2005/10/12 15:44:57 CEST
Modified files:
core/src/java/org/jahia/hibernate/dao JahiaAclDAO.java
JahiaSitePropertyDAO.java
JahiaUserDAO.java
core/src/java/org/jahia/hibernate/manager
JahiaUserManager.java
Log:
Error in deleting of an user (remove acl entry and remove correctly sitesuser
binding)
Revision Changes Path
1.5 +0 -5
jahia/core/src/java/org/jahia/hibernate/dao/JahiaAclDAO.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/dao/JahiaAclDAO.java.diff?r1=1.4&r2=1.5&f=h
1.5 +1 -3
jahia/core/src/java/org/jahia/hibernate/dao/JahiaSitePropertyDAO.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/dao/JahiaSitePropertyDAO.java.diff?r1=1.4&r2=1.5&f=h
1.6 +1 -1
jahia/core/src/java/org/jahia/hibernate/dao/JahiaUserDAO.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/dao/JahiaUserDAO.java.diff?r1=1.5&r2=1.6&f=h
1.5 +0 -0
jahia/core/src/java/org/jahia/hibernate/manager/JahiaUserManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/manager/JahiaUserManager.java.diff?r1=1.4&r2=1.5&f=h
Index: JahiaAclDAO.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/dao/JahiaAclDAO.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JahiaAclDAO.java 18 Jul 2005 11:24:49 -0000 1.4
+++ JahiaAclDAO.java 12 Oct 2005 13:44:56 -0000 1.5
@@ -142,11 +142,6 @@
final HibernateTemplate template = getHibernateTemplate();
template.setCacheQueries(true);
ret = template.find(hql, name);
- for (int i = 0; i < ret.size(); i++) {
- JahiaAcl acl = (JahiaAcl) ret.get(i);
- acl.getGroupEntries().isEmpty();
- acl.getUserEntries().isEmpty();
- }
}
return ret;
}
Index: JahiaSitePropertyDAO.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/dao/JahiaSitePropertyDAO.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JahiaSitePropertyDAO.java 29 Jul 2005 12:33:33 -0000 1.4
+++ JahiaSitePropertyDAO.java 12 Oct 2005 13:44:56 -0000 1.5
@@ -3,8 +3,6 @@
*/
package org.jahia.hibernate.dao;
-import org.hibernate.type.Type;
-import org.hibernate.type.TypeFactory;
import org.jahia.hibernate.model.JahiaSite;
import org.jahia.hibernate.model.JahiaSiteProp;
import org.springframework.orm.ObjectRetrievalFailureException;
@@ -46,7 +44,7 @@
JahiaSiteProp retval = null;
String hql = "from JahiaSiteProp aTable WHERE aTable.comp_id.id = ?
and aTable.comp_id.name = ?";
if (id == null || name == null) {
- log.error("Error: Cannot use null in query for unique column");
+ log.error("Error: Cannot use null in query for unique column
site "+id+" key= "+name);
throw new RuntimeException("Error: Cannot use null in query for
unique column");
} else {
final HibernateTemplate template = getHibernateTemplate();
Index: JahiaUserDAO.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/dao/JahiaUserDAO.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JahiaUserDAO.java 6 Oct 2005 15:56:03 -0000 1.5
+++ JahiaUserDAO.java 12 Oct 2005 13:44:56 -0000 1.6
@@ -273,7 +273,7 @@
public void removeMemberFromAllSite(String name) {
HibernateTemplate template = getHibernateTemplate();
- template.deleteAll(template.find("from JahiaSitesUser u where
u.user.name=?", name));
+ template.deleteAll(template.find("from JahiaSitesUser u where
u.user.key=?", name));
}
public void removeAllMembersFromSite(Integer siteID) {
