ZhouXY108
/
wisemapping-open-source
mirror of https://github.com/wisemapping/wisemapping-open-source.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix db error during account creation.

main
Paulo Gustavo Veiga 2022-09-27 20:14:32 -07:00
parent 5f26874b47
commit aa6ac9bf7f
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,6 +115,7 @@ public class UserManagerImpl
Collaboration newCollab = new Collaboration(); Collaboration newCollab = new Collaboration();
newCollab.setRoleId(oldCollab.getRole().ordinal()); newCollab.setRoleId(oldCollab.getRole().ordinal());
newCollab.setMindMap(oldCollab.getMindMap()); newCollab.setMindMap(oldCollab.getMindMap());
oldCollab.getMindMap().removedCollaboration(oldCollab);
newCollab.setCollaborator(user); newCollab.setCollaborator(user);
user.addCollaboration(newCollab); user.addCollaboration(newCollab);
newCollabs.add(newCollab); newCollabs.add(newCollab);
@ -124,7 +125,6 @@ public class UserManagerImpl
final HibernateTemplate template = getHibernateTemplate(); final HibernateTemplate template = getHibernateTemplate();
collaborations.forEach(c -> template.delete(c)); collaborations.forEach(c -> template.delete(c));
template.delete(collaborator); template.delete(collaborator);
template.flush();
// Save all new... // Save all new...
this.createUser(user); this.createUser(user);

8
wise-webapp/src/main/java/com/wisemapping/model/Collaboration.java
View File

@ -21,6 +21,7 @@ package com.wisemapping.model;
import org.hibernate.annotations.Fetch; import org.hibernate.annotations.Fetch;
import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.FetchMode;
import org.jetbrains.annotations.Nullable;
import javax.persistence.*; import javax.persistence.*;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
@ -46,7 +47,7 @@ public class Collaboration implements Serializable {
private Collaborator collaborator; private Collaborator collaborator;
@ManyToOne(cascade = CascadeType.ALL) @ManyToOne(cascade = CascadeType.ALL)
@JoinColumn(name = "properties_id", nullable = false, unique = true) @JoinColumn(name = "properties_id", nullable = true, unique = true)
private CollaborationProperties collaborationProperties = new CollaborationProperties(); private CollaborationProperties collaborationProperties = new CollaborationProperties();
public Collaboration() { public Collaboration() {
@ -103,12 +104,13 @@ public class Collaboration implements Serializable {
this.collaborator = collaborator; this.collaborator = collaborator;
} }
@NotNull
@Nullable
public CollaborationProperties getCollaborationProperties() { public CollaborationProperties getCollaborationProperties() {
return this.collaborationProperties; return this.collaborationProperties;
} }
public void setCollaborationProperties(@NotNull CollaborationProperties collaborationProperties) { public void setCollaborationProperties(@Nullable CollaborationProperties collaborationProperties) {
this.collaborationProperties = collaborationProperties; this.collaborationProperties = collaborationProperties;
} }