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

Clean up dependencies on map delete

main
Paulo Gustavo Veiga 2022-09-27 18:47:56 -07:00
parent 599bc9ec00
commit 5f26874b47
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java
View File

@ -227,15 +227,18 @@ public class MindmapManagerImpl
} }
@Override @Override
public void removeMindmap(@NotNull final Mindmap mindMap) { public void removeMindmap(@NotNull final Mindmap mindmap) {
// Delete history first ... // Delete history first ...
final Criteria hibernateCriteria = currentSession().createCriteria(MindMapHistory.class); final Criteria hibernateCriteria = currentSession().createCriteria(MindMapHistory.class);
hibernateCriteria.add(Restrictions.eq("mindmapId", mindMap.getId())); hibernateCriteria.add(Restrictions.eq("mindmapId", mindmap.getId()));
List list = hibernateCriteria.list(); final List list = hibernateCriteria.list();
getHibernateTemplate().deleteAll(list); getHibernateTemplate().deleteAll(list);
// Remove collaborations ...
mindmap.removedCollaboration(mindmap.getCollaborations());
// Delete mindmap .... // Delete mindmap ....
getHibernateTemplate().delete(mindMap); getHibernateTemplate().delete(mindmap);
} }
private void saveHistory(@NotNull final Mindmap mindMap) { private void saveHistory(@NotNull final Mindmap mindMap) {

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

@ -146,7 +146,11 @@ public class Mindmap implements Serializable {
} }
public void removedCollaboration(@NotNull Collaboration collaboration) { public void removedCollaboration(@NotNull Collaboration collaboration) {
collaborations.add(collaboration); collaborations.remove(collaboration);
}
public void removedCollaboration(@NotNull Set<Collaboration> collaborations) {
this.collaborations.removeAll(collaborations);
} }
@NotNull @NotNull
@ -182,7 +186,7 @@ public class Mindmap implements Serializable {
} }
public boolean isCreator(@NotNull User user) { public boolean isCreator(@NotNull User user) {
return this.getCreator()!=null && this.getCreator().identityEquality(user); return this.getCreator() != null && this.getCreator().identityEquality(user);
} }
public boolean isPublic() { public boolean isPublic() {

2
wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java
View File

@ -129,7 +129,7 @@ public class AccountController extends BaseController {
} }
// Delete labels .... // Delete labels ....
List<Label> labels = labelService.getAll(user); final List<Label> labels = labelService.getAll(user);
labels.forEach(l -> { labels.forEach(l -> {
try { try {
labelService.removeLabel(l, user); labelService.removeLabel(l, user);