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

Add readOnly support to the mindmapList.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2012-06-17 12:24:09 -03:00
parent 5e67811dcf
commit 26766fdbc6
13 changed files with 256 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
wise-webapp/src/main/java/com/wisemapping/ncontroller/MindmapController.java
View File

@@ -20,6 +20,7 @@ package com.wisemapping.ncontroller;
import com.wisemapping.filter.UserAgent;
import com.wisemapping.model.CollaborationRole;
import com.wisemapping.model.MindMap;
import com.wisemapping.security.Utils;
import com.wisemapping.service.MindmapService;
@@ -61,13 +62,6 @@ public class MindmapController {
return "mindmapPrint";
}
@RequestMapping(value = "maps/{id}/view")
public String showViewPage(@PathVariable int id, @NotNull Model model) {
final MindMap mindmap = findMindmap(id);
model.addAttribute("mindmap", mindmap);
return "mindmapPrint";
}
@RequestMapping(value = "maps/{id}/export")
public String showExportPage(@PathVariable int id, @NotNull Model model) throws IOException {
final MindMap mindmap = findMindmap(id);
@@ -124,23 +118,27 @@ public class MindmapController {
return "mindmapList";
}
@RequestMapping(value = "maps/{id}/edit")
public ModelAndView editMap(@PathVariable int id, @NotNull HttpServletRequest request) {
ModelAndView view;
final UserAgent userAgent = UserAgent.create(request);
if (userAgent.needsGCF()) {
view = new ModelAndView("gcfPluginNeeded");
// view.addObject(MINDMAP_ID_PARAMETER, mindmapId);
} else {
@RequestMapping(value = "maps/{id}/edit", method = RequestMethod.GET)
public String showMindmapEditorPage(@PathVariable int id, @NotNull Model model) {
final MindMapBean mindmapBean = findMindmapBean(id);
final MindMap mindmap = mindmapBean.getDelegated();
final MindMapBean mindmap = findMindmapBean(id);
view = new ModelAndView("mindmapEditor", "mindmap", mindmap);
view.addObject("editorTryMode", false);
final boolean showHelp = isWelcomeMap(mindmap);
view.addObject("showHelp", showHelp);
view.addObject("user", Utils.getUser());
String result;
if (mindmap.hasPermissions(Utils.getUser(), CollaborationRole.EDITOR)) {
model.addAttribute("mindmap", mindmapBean);
result = "mindmapEditor";
} else {
result = "redirect:view";
}
return view;
return result;
}
@RequestMapping(value = "maps/{id}/view", method = RequestMethod.GET)
public String showMindmapViewerPage(@PathVariable int id, @NotNull Model model) {
final MindMapBean mindmapBean = findMindmapBean(id);
model.addAttribute("mindmap", mindmapBean);
model.addAttribute("readOnlyMode", true);
return "mindmapEditor";
}
@RequestMapping(value = "maps/{id}/embed")

72
wise-webapp/src/main/java/com/wisemapping/view/HistoryBean.java
View File

@@ -1,72 +0,0 @@
/*
* Copyright [2011] [wisemapping]
*
* Licensed under WiseMapping Public License, Version 1.0 (the "License").
* It is basically the Apache License, Version 2.0 (the "License") plus the
* "powered by wisemapping" text requirement on every single page;
* you may not use this file except in compliance with the License.
* You may obtain a copy of the license at
*
* http://www.wisemapping.org/license
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.wisemapping.view;
import java.util.Calendar;
import java.util.Locale;
import java.text.DateFormat;
public class HistoryBean
{
private Calendar historyTime;
private String author;
private int mindmapId;
private int historyId;
public HistoryBean() {}
public HistoryBean(int mindmapId,int historyId,String author, Calendar time)
{
this.mindmapId = mindmapId;
this.author = author;
this.historyTime = time;
this.historyId = historyId;
}
public Calendar getHistoryTime() {
return historyTime;
}
public String getCreation(Locale locale)
{
return DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.DEFAULT,locale).format(historyTime.getTime());
}
public void setHistoryTime(Calendar historyTime) {
this.historyTime = historyTime;
}
public String getAuthor() {
return author;
}
public void setAuthor(String author) {
this.author = author;
}
public int getMindMapId()
{
return mindmapId;
}
public int getHistoryId()
{
return historyId;
}
}

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

@@ -31,11 +31,11 @@ import java.util.*;
public class MindMapBean {
private MindMap mindMap;
private List<CollaboratorBean> viewers;
private List<CollaboratorBean> colaborators;
private List<CollaboratorBean> collaborators;
public MindMapBean(final MindMap mindmap) {
this.mindMap = mindmap;
this.colaborators = filterCollaboratorBy(mindmap.getCollaborations(), CollaborationRole.EDITOR);
this.collaborators = filterCollaboratorBy(mindmap.getCollaborations(), CollaborationRole.EDITOR);
this.viewers = filterCollaboratorBy(mindmap.getCollaborations(), CollaborationRole.VIEWER);
}
@@ -64,7 +64,7 @@ public class MindMapBean {
}
public List<CollaboratorBean> getCollaborators() {
return colaborators;
return collaborators;
}
public String getLastEditor() {
@@ -96,7 +96,7 @@ public class MindMapBean {
}
public int getCountCollaborators() {
return colaborators != null ? colaborators.size() : 0;
return collaborators != null ? collaborators.size() : 0;
}
public int getCountViewers() {
@@ -135,4 +135,12 @@ public class MindMapBean {
return mindMap.hasPermissions(Utils.getUser(), CollaborationRole.OWNER);
}
public boolean isEditor() {
return mindMap.hasPermissions(Utils.getUser(), CollaborationRole.EDITOR);
}
public MindMap getDelegated(){
return mindMap;
}
}