Merge branch 'issue-10' into develop

Conflicts: carcv-webapp/src/main/webapp/app/cartable.jsp
oskopek · Apr 18, 2014 · 30578c2 · 30578c2
2 parents 8128832 + 619ae28
commit 30578c2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/carcv-webapp/src/main/java/org/carcv/web/servlet/CarTableServlet.java b/carcv-webapp/src/main/java/org/carcv/web/servlet/CarTableServlet.java
@@ -49,6 +49,8 @@ public class CarTableServlet extends HttpServlet {
     @EJB
     private EntryBean bean;
 
+    private static final String adminRole = "admin";
+
     /**
      * @see CarTableServlet
      * @param request the HttpServletRequest
@@ -106,6 +108,10 @@ public int compare(FileEntry o1, FileEntry o2) {
         }
 
         request.setAttribute("wrtmList", wrtmList);
+
+        boolean isAdmin = request.isUserInRole(adminRole);
+        request.setAttribute("isAdmin", Boolean.valueOf(isAdmin));
+
         RequestDispatcher rd = getServletContext().getRequestDispatcher("/app/cartable.jsp");
         rd.forward(request, response);
     }

diff --git a/carcv-webapp/src/main/webapp/app/cartable.jsp b/carcv-webapp/src/main/webapp/app/cartable.jsp
@@ -47,7 +47,7 @@
                     <script>
                         function confirmRemove() {
                             var result = confirm("Are you sure you want to delete?");
-                            if (result) { // TODO remove the correct entry!
+                            if (result) { // TODO remove the correct entry! See issue #28
                                 window.parent.location.replace("/admin/servlet/RemoveEntry?entry_id=${member.entryId}");
                             }
                         }