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

Remove the loading text from dialog ...

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2012-07-01 17:56:31 -03:00
parent 7752ac0dc1
commit 0cb142d3fd
16 changed files with 124 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,7 @@ import com.wisemapping.exceptions.WiseMappingException;
import com.wisemapping.model.CollaborationRole;
import com.wisemapping.model.MindMap;
import com.wisemapping.model.MindMapHistory;
import com.wisemapping.model.User;
import com.wisemapping.security.Utils;
import com.wisemapping.service.MindmapService;
import com.wisemapping.view.MindMapBean;
@@ -67,6 +68,7 @@ public class MindmapController {
@RequestMapping(value = "maps/{id}/print")
public String showPrintPage(@PathVariable int id, @NotNull Model model) {
final MindMapBean mindmap = findMindmapBean(id);
model.addAttribute("principal", Utils.getUser());
model.addAttribute("mindmap", mindmap);
return "mindmapPrint";
}
@@ -124,7 +126,9 @@ public class MindmapController {
}
@RequestMapping(value = "maps/")
public String showListPage() {
public String showListPage(@NotNull Model model) {
final Locale locale = LocaleContextHolder.getLocale();
model.addAttribute("locale", locale.getLanguage());
return "mindmapList";
}
@@ -140,6 +144,7 @@ public class MindmapController {
// Configure default locale for the editor ...
final Locale locale = LocaleContextHolder.getLocale();
model.addAttribute("locale", locale.getLanguage());
model.addAttribute("principal", Utils.getUser());
result = "mindmapEditor";
} else {
result = "redirect:view";