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

Keep fixing user issues.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2012-11-14 20:33:42 -03:00
parent 16e59a0879
commit 596aeeebc4
7 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wise-webapp/src/main/java/com/wisemapping/service/LockManagerImpl.java
View File

@@ -101,7 +101,7 @@ class LockManagerImpl implements LockManager {
public boolean isLockedBy(@NotNull Mindmap mindmap, @NotNull User collaborator) {
boolean result = false;
final LockInfo lockInfo = this.getLockInfo(mindmap);
if (lockInfo != null && lockInfo.getUser().equalCollab(collaborator)) {
if (lockInfo != null && lockInfo.getUser().identityEquality(collaborator)) {
result = true;
}
return result;

6
wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java
View File

@@ -115,7 +115,7 @@ public class MindmapServiceImpl
final Set<Collaboration> collaborations = mindMap.getCollaborations();
final User creator = mindMap.getCreator();
if (creator.equalCollab(collaboration.getCollaborator())) {
if (creator.identityEquality(collaboration.getCollaborator())) {
throw new CollaborationException("User is the creator and must have ownership permissions.Creator Email:" + mindMap.getCreator().getEmail() + ",Collaborator:" + collaboration.getCollaborator().getEmail());
}
@@ -126,7 +126,7 @@ public class MindmapServiceImpl
@Override
public void removeMindmap(@NotNull Mindmap mindmap, @NotNull User user) throws WiseMappingException {
if (mindmap.getCreator().equalCollab(user)) {
if (mindmap.getCreator().identityEquality(user)) {
mindmapManager.removeMindmap(mindmap);
} else {
final Collaboration collaboration = mindmap.findCollaboration(user);
@@ -265,7 +265,7 @@ public class MindmapServiceImpl
@Override
public void updateCollaboration(@NotNull Collaborator collaborator, @NotNull Collaboration collaboration) throws WiseMappingException {
if (collaborator.equalCollab(collaboration.getCollaborator())) {
if (collaborator.identityEquality(collaboration.getCollaborator())) {
throw new WiseMappingException("No enough permissions for this operation.");
}
mindmapManager.updateCollaboration(collaboration);