mirror of
https://bitbucket.org/wisemapping/wisemapping-open-source.git
synced 2024-11-21 13:47:57 +01:00
Fix creation.
This commit is contained in:
parent
3eaeb8f500
commit
61c691fc82
@ -99,9 +99,9 @@ public class MindmapServiceImpl
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Nullable
|
@Nullable
|
||||||
@PreAuthorize("hasPermission(#id, 'READ')")
|
@PreAuthorize("hasPermission(#mapId, 'READ')")
|
||||||
public Mindmap findMindmapById(int id) {
|
public Mindmap findMindmapById(int mapId) {
|
||||||
return mindmapManager.getMindmapById(id);
|
return mindmapManager.getMindmapById(mapId);
|
||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
@ -246,9 +246,9 @@ public class MindmapServiceImpl
|
|||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@PreAuthorize("hasAnyRole('USER', 'ADMIN') && hasPermission(#mindmap, 'READ')")
|
@PreAuthorize("hasAnyRole('USER', 'ADMIN') && hasPermission(#mapId, 'READ')")
|
||||||
public List<MindMapHistory> findMindmapHistory(int mindmapId) {
|
public List<MindMapHistory> findMindmapHistory(int mapId) {
|
||||||
return mindmapManager.getHistoryFrom(mindmapId);
|
return mindmapManager.getHistoryFrom(mapId);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -261,9 +261,9 @@ public class MindmapServiceImpl
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@PreAuthorize("hasAnyRole('USER', 'ADMIN') && hasPermission(#mindmap, 'READ')")
|
@PreAuthorize("hasAnyRole('USER', 'ADMIN') && hasPermission(#mapId, 'READ')")
|
||||||
public MindMapHistory findMindmapHistory(int id, int hid) throws WiseMappingException {
|
public MindMapHistory findMindmapHistory(int mapId, int hid) throws WiseMappingException {
|
||||||
final List<MindMapHistory> mindmapHistory = this.findMindmapHistory(id);
|
final List<MindMapHistory> mindmapHistory = this.findMindmapHistory(mapId);
|
||||||
MindMapHistory result = null;
|
MindMapHistory result = null;
|
||||||
for (MindMapHistory history : mindmapHistory) {
|
for (MindMapHistory history : mindmapHistory) {
|
||||||
if (history.getId() == hid) {
|
if (history.getId() == hid) {
|
||||||
@ -273,7 +273,7 @@ public class MindmapServiceImpl
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (result == null) {
|
if (result == null) {
|
||||||
throw new WiseMappingException("History could not be found for mapid=" + id + ",hid" + hid);
|
throw new WiseMappingException("History could not be found for mapid=" + mapId + ",hid" + hid);
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
@ -293,7 +293,6 @@ public class MindmapServiceImpl
|
|||||||
return this.lockManager;
|
return this.lockManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
@PreAuthorize("hasAnyRole('USER', 'ADMIN') && hasPermission(#mindmap, 'READ')")
|
|
||||||
private Collaboration getCollaborationBy(@NotNull final String email, @NotNull final Set<Collaboration> collaborations) {
|
private Collaboration getCollaborationBy(@NotNull final String email, @NotNull final Set<Collaboration> collaborations) {
|
||||||
Collaboration collaboration = null;
|
Collaboration collaboration = null;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user