vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-26 15:54:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix problem opening public maps.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2012-09-13 00:17:49 -03:00
parent 4c988d4ae2
commit a1199687d4
2 changed files with 15 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/MindmapManager.java
View File

@ -20,6 +20,7 @@ package com.wisemapping.dao;
import com.wisemapping.model.*; import com.wisemapping.model.*;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.List; import java.util.List;
@ -37,6 +38,7 @@ public interface MindmapManager {
List<Mindmap> getAllMindmaps(); List<Mindmap> getAllMindmaps();
@Nullable
Mindmap getMindmapById(int mindmapId); Mindmap getMindmapById(int mindmapId);
Mindmap getMindmapByTitle(final String name, final User user); Mindmap getMindmapByTitle(final String name, final User user);

17
wise-webapp/src/main/java/com/wisemapping/view/MindMapBean.java
View File

@ -18,6 +18,7 @@
package com.wisemapping.view; package com.wisemapping.view;
import com.wisemapping.exceptions.AccessDeniedSecurityException;
import com.wisemapping.exceptions.WiseMappingException; import com.wisemapping.exceptions.WiseMappingException;
import com.wisemapping.model.*; import com.wisemapping.model.*;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -126,14 +127,22 @@ public class MindMapBean {
} }
public String getProperties() throws WiseMappingException { public String getProperties() throws WiseMappingException {
String result; String result = null;
if (collaborator != null) { if (collaborator != null) {
final CollaborationProperties properties = this.mindmap.findCollaborationProperties(collaborator); try {
result = properties.getMindmapProperties(); final CollaborationProperties properties = this.mindmap.findCollaborationProperties(collaborator);
} else { result = properties.getMindmapProperties();
} catch (AccessDeniedSecurityException e) {
// Ignore exception. This is required for the admin could view maps ...
}
}
if (result == null) {
// It must be public view ... // It must be public view ...
result = CollaborationProperties.DEFAULT_JSON_PROPERTIES; result = CollaborationProperties.DEFAULT_JSON_PROPERTIES;
} }
return result; return result;
} }