From ec41dafcf5cafd22694c0443212fbb70930c60a3 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Sun, 24 Jun 2012 20:25:27 -0300 Subject: [PATCH] - Fix duplicate map bug. --- .../com/wisemapping/rest/MindmapController.java | 1 - .../webapp/WEB-INF/classes/messages.properties | 3 ++- wise-webapp/src/main/webapp/js/mindmapList.js | 15 +++++++-------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java index f4ca0ab6..8f48644b 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java @@ -413,7 +413,6 @@ public class MindmapController extends BaseController { final MindMap clonedMap = mindMap.shallowClone(); clonedMap.setTitle(restMindmap.getTitle()); clonedMap.setDescription(restMindmap.getDescription()); - clonedMap.setCreator(user); // Add new mindmap ... mindmapService.addMindmap(clonedMap, user); diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties b/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties index 8843bfbf..73abdb8d 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties +++ b/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties @@ -65,7 +65,8 @@ FILE=File FILE_URL=File URL STATUS=Status LAST_EDITOR=Last Edition - +LAST_UPDATE=Last Update +LAST_UPDATE_BY=Last Update By DELETE_SELECTED_CONFIRMATION=All selected Maps will be deleted. Do you want to continue? DELETE_CONFIRMATION=Are you sure that you want to delete this map? DELETE_SELECTED=Delete selected diff --git a/wise-webapp/src/main/webapp/js/mindmapList.js b/wise-webapp/src/main/webapp/js/mindmapList.js index 71fef6f3..c7f991e5 100644 --- a/wise-webapp/src/main/webapp/js/mindmapList.js +++ b/wise-webapp/src/main/webapp/js/mindmapList.js @@ -425,35 +425,34 @@ $(function() { $("#printBtn").click(function() { var mapIds = $('#mindmapListTable').dataTableExt.getSelectedMapsIds(); if (mapIds.length > 0) { - window.open('c/maps/' + mapIds[0] + '/print'); + window.open('/c/maps/' + mapIds[0] + '/print'); } }); $("#infoBtn").click(function() { - showEmbeddedDialog("c/maps/{mapId}/details", 'info-dialog-modal'); + showEmbeddedDialog("/c/maps/{mapId}/details", 'info-dialog-modal'); }); $("#historyBtn").click(function() { - showEmbeddedDialog("c/maps/{mapId}/history", 'history-dialog-modal'); + showEmbeddedDialog("/c/maps/{mapId}/history", 'history-dialog-modal'); }); $("#publishBtn").click(function() { - showEmbeddedDialog("c/maps/{mapId}/publish", "publish-dialog-modal"); + showEmbeddedDialog("/c/maps/{mapId}/publish", "publish-dialog-modal"); }); $("#exportBtn").click(function() { - showEmbeddedDialog("c/maps/{mapId}/export", 'export-dialog-modal'); + showEmbeddedDialog("/c/maps/{mapId}/export", 'export-dialog-modal'); }); $("#importBtn").click(function() { - showEmbeddedDialog("c/maps/import", 'import-dialog-modal', true); + showEmbeddedDialog("/c/maps/import", 'import-dialog-modal', true); }); $("#shareBtn").click(function() { - showEmbeddedDialog("c/maps/{mapId}/share", 'share-dialog-modal', true); + showEmbeddedDialog("/c/maps/{mapId}/share", 'share-dialog-modal', true); }); - var showEmbeddedDialog = function(urlTemplate, dialogElemId, ignore) { var mapIds = $('#mindmapListTable').dataTableExt.getSelectedMapsIds(); if (mapIds.length > 0 || ignore) {