zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

solving merge conflict

Browse Source
This commit is contained in:
Ezequiel Bergamaschi
2014-02-05 21:21:00 -03:00
committed by Ezequiel Bergamaschi
parent 6fe9dcf578 58390dfb92
commit 29acc46d34
20 changed files with 427 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wise-webapp/src/main/java/com/wisemapping/dao/UserManager.java
View File

@@ -45,6 +45,6 @@ public interface UserManager {
public User createUser(User user, Collaborator col);
public void deleteUser(User user);
public void removeUser(@NotNull User user);
}

5
wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java
View File

@@ -110,11 +110,8 @@ public class UserManagerImpl
}
@Override
public void deleteUser(@NotNull User user) {
final Collaborator collaborator = this.getCollaboratorBy(user.getEmail());
getHibernateTemplate().delete(collaborator);
public void removeUser(@NotNull final User user) {
getHibernateTemplate().delete(user);
getHibernateTemplate().flush();
}
public void auditLogin(@NotNull AccessAuditory accessAuditory) {