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

Improve and fix print.

Browse Source 
Support for jetty:run fixed.
Several minor fixes.
This commit is contained in:
Paulo Gustavo Veiga
2012-04-05 14:18:13 -03:00
parent 1aa4859da1
commit a141414b4b
21 changed files with 269 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wise-webapp/src/main/java/com/wisemapping/controller/MindmapEditorController.java
View File

@@ -58,8 +58,6 @@ public class MindmapEditorController extends BaseMultiActionController {
view.addObject("editorTryMode", false);
final boolean showHelp = isWelcomeMap(mindmap);
view.addObject("showHelp", showHelp);
final String xmlMap = mindmap.getXmlAsJsLiteral();
view.addObject(MAP_XML_PARAM, xmlMap);
view.addObject("user", Utils.getUser());
}
return view;

2
wise-webapp/src/main/java/com/wisemapping/model/MindMap.java
View File

@@ -225,7 +225,7 @@ public class MindMap {
result.append("<map version=\"tango\">");
result.append("<topic central=\"true\" text=\"");
result.append(title);
result.append("\"/></result>");
result.append("\"/></map>");
return result.toString();
}

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

@@ -33,14 +33,8 @@ public class MindmapController {
return new ModelAndView("mindmapExport", "mindmap", modelObject);
}
@RequestMapping(value = "edit")
public ModelAndView edit(@RequestParam(required = true) long mapId) {
final MindMapBean modelObject = findMindmapBean(mapId);
return new ModelAndView("mindmapEditor", "wisemapsList", modelObject);
}
@RequestMapping(value = "collaborator")
public ModelAndView collaborator(@RequestParam(required = true) long mapId) {
public ModelAndView showCollaborator(@RequestParam(required = true) long mapId) {
final MindMapBean modelObject = findMindmapBean(mapId);
return new ModelAndView("mindmapCollaborator", "mindmap", modelObject);
}
@@ -52,13 +46,21 @@ public class MindmapController {
}
@RequestMapping(value = "detail")
public ModelAndView detail(@RequestParam(required = true) long mapId) {
public ModelAndView showDetails(@RequestParam(required = true) long mapId) {
final MindMapBean modelObject = findMindmapBean(mapId);
final ModelAndView view = new ModelAndView("mindmapDetail", "wisemapDetail", modelObject);
view.addObject("user", Utils.getUser());
return view;
}
@RequestMapping(value = "print")
public ModelAndView showPrintPage(@RequestParam(required = true) long mapId) {
final MindMap mindmap = findMindmap(mapId);
final ModelAndView view = new ModelAndView("mindmapPrint", "mindmap", mindmap);
view.addObject("user", Utils.getUser());
return view;
}
@RequestMapping(value = "changeStatus")
public ModelAndView changeStatus(@RequestParam(required = true) long mapId) throws WiseMappingException {
final MindMap mindmap = findMindmap(mapId);
@@ -68,14 +70,6 @@ public class MindmapController {
return new ModelAndView("mindmapDetail", "wisemapDetail", new MindMapBean(mindmap));
}
@RequestMapping(value = "editMindmap")
public ModelAndView editMindmap(@RequestParam(required = true) long mapId) throws WiseMappingException {
final MindMapBean mindmap = findMindmapBean(mapId);
final ModelAndView view = new ModelAndView("editMindmap", "mindmap", mindmap);
view.addObject("user", Utils.getUser());
return view;
}
@RequestMapping(value = "mymaps")
public ModelAndView list(@NotNull HttpServletRequest request) {
final HttpSession session = request.getSession(false);