From 29091dec8802ec390e3183c5543e326f109bc561 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Sun, 17 Jun 2012 22:48:33 -0300 Subject: [PATCH] Show collaboration role on details. --- .../com/wisemapping/view/MindMapBean.java | 6 +++++ .../WEB-INF/classes/messages.properties | 1 + .../src/main/webapp/jsp/mindmapDetail.jsp | 25 +++++++++++-------- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/wise-webapp/src/main/java/com/wisemapping/view/MindMapBean.java b/wise-webapp/src/main/java/com/wisemapping/view/MindMapBean.java index e982928b..0ecc46e9 100644 --- a/wise-webapp/src/main/java/com/wisemapping/view/MindMapBean.java +++ b/wise-webapp/src/main/java/com/wisemapping/view/MindMapBean.java @@ -141,6 +141,12 @@ public class MindMapBean { return mindmap.hasPermissions(collaborator, CollaborationRole.EDITOR); } + public String getRole() { + final Collaboration collaboration = this.mindmap.findCollaboration(collaborator); + return collaboration.getRole().getLabel(); + } + + public MindMap getDelegated() { return mindmap; } 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 c8d64b42..eb419d20 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties +++ b/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties @@ -36,6 +36,7 @@ JOIN_NOW=Join Now! REMOVE=Remove MINDMAP=Mindmap ROLE=Role +YOUR_ROLE=Your Role CAPTCHA= Word Verification FORGOT_PASSWORD=Forgot Password ? CHANGE_PASSWORD=Change your Password diff --git a/wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp b/wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp index dc4ef4f1..f4c2af57 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp @@ -22,17 +22,22 @@