upd: Ordering, remove items on orga-view

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 424999d5990fd2f5d85a950b3cef579a7c5cbb69..43251ab57e6db12935673ae4bcc213d28a1b3508 100644 (file)
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -139,9 +139,11 @@ public class Gigi extends HttpServlet {
             putPage(TTPAdminPage.PATH + "/*", new TTPAdminPage(), "Admin");
             putPage(CreateOrgPage.DEFAULT_PATH, new CreateOrgPage(), "Organisation Admin");
             putPage(ViewOrgPage.DEFAULT_PATH + "/*", new ViewOrgPage(), "Organisation Admin");
-            putPage(FindUserPage.PATH, new FindUserPage("Find User"), "System Admin");
-            putPage(FindDomainPage.PATH, new FindDomainPage("Find Domain"), "System Admin");
-            putPage(SupportEnterTicketPage.PATH, new SupportEnterTicketPage(), "System Admin");
+
+            putPage(SupportEnterTicketPage.PATH, new SupportEnterTicketPage(), "Support Console");
+            putPage(FindUserPage.PATH, new FindUserPage("Find User"), "Support Console");
+            putPage(FindDomainPage.PATH, new FindDomainPage("Find Domain"), "Support Console");
+
             putPage(SupportUserDetailsPage.PATH + "*", new SupportUserDetailsPage("Support: User Details"), null);
             putPage(UserHistory.PATH, new UserHistory(false), "My Account");
             putPage(UserHistory.SUPPORT_PATH, new UserHistory(true), null);

diff --git a/src/org/cacert/gigi/pages/account/ChangePasswordPage.java b/src/org/cacert/gigi/pages/account/ChangePasswordPage.java
index 47a5f9151d25f317c819b612204efb56cb4bdc4d..8432f027b0aaedc687d189a6605ab350ab34e65e 100644 (file)
--- a/src/org/cacert/gigi/pages/account/ChangePasswordPage.java
+++ b/src/org/cacert/gigi/pages/account/ChangePasswordPage.java
@@ -6,8 +6,10 @@ import java.util.HashMap;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.output.template.Form;
 import org.cacert.gigi.pages.Page;
+import org.cacert.gigi.util.AuthorizationContext;
 
 public class ChangePasswordPage extends Page {
 
@@ -28,4 +30,8 @@ public class ChangePasswordPage extends Page {
         f.submit(resp.getWriter(), req);
     }
 
+    @Override
+    public boolean isPermitted(AuthorizationContext ac) {
+        return ac != null && ac.getTarget() instanceof User;
+    }
 }

diff --git a/src/org/cacert/gigi/pages/account/UserTrainings.java b/src/org/cacert/gigi/pages/account/UserTrainings.java
index 8c117d5ee53ac3216eff8891c0a65d35f140573d..3a0a450be05fe3975559b71cd8e199d1e2205b7f 100644 (file)
--- a/src/org/cacert/gigi/pages/account/UserTrainings.java
+++ b/src/org/cacert/gigi/pages/account/UserTrainings.java
@@ -47,6 +47,13 @@ public class UserTrainings extends Page {
 
     @Override
     public boolean isPermitted(AuthorizationContext ac) {
-        return ac != null && ( !support || ac.canSupport());
+        if (ac == null) {
+            return false;
+        }
+        if (support) {
+            return ac.canSupport();
+        } else {
+            return ac.getTarget() instanceof User;
+        }
     }
 }

diff --git a/src/org/cacert/gigi/pages/account/mail/MailOverview.java b/src/org/cacert/gigi/pages/account/mail/MailOverview.java
index 092b6a57a94ec00178149d5e6f08a5658a3cbd84..61f583ab9d84471807a359e90f4958f00c48a0d4 100644 (file)
--- a/src/org/cacert/gigi/pages/account/mail/MailOverview.java
+++ b/src/org/cacert/gigi/pages/account/mail/MailOverview.java
@@ -11,6 +11,7 @@ import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.template.Form;
 import org.cacert.gigi.pages.Page;
+import org.cacert.gigi.util.AuthorizationContext;
 
 public class MailOverview extends Page {
 
@@ -46,4 +47,9 @@ public class MailOverview extends Page {
         }
         super.doPost(req, resp);
     }
+
+    @Override
+    public boolean isPermitted(AuthorizationContext ac) {
+        return ac != null && ac.getTarget() instanceof User;
+    }
 }

diff --git a/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketPage.java b/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketPage.java
index 10b65f6a079ed4c0b81e521a5f2919cf0951f2c3..563ca18a83ea64c45cc28bbe0ca746aa160471f8 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketPage.java
+++ b/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketPage.java
@@ -27,11 +27,7 @@ public class SupportEnterTicketPage extends Page {
         SupportEnterTicketForm f = Form.getForm(req, SupportEnterTicketForm.class);
         try {
             if (f.submit(resp.getWriter(), req)) {
-                if (req.getParameter("setTicket") != null) {
-                    resp.sendRedirect(FindUserPage.PATH);
-                } else {
-                    resp.sendRedirect(PATH);
-                }
+                resp.sendRedirect(PATH);
                 return true;
             }
         } catch (GigiApiException e) {