From: Lucas Werkmeister <mail@lucaswerkmeister.de>
Date: Mon, 23 Jul 2018 20:46:30 +0000 (+0200)
Subject: Merge "add: ensure org ra agents cannot manage org where they are org admin"
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=883d4975772ff13be7cb7ab7743dcb52b9ee709c;hp=c4f20785b474fd97b3d4f1cb50b641a0d4b330a5

Merge "add: ensure org ra agents cannot manage org where they are org admin"
---

diff --git a/src/club/wpia/gigi/pages/orga/ViewOrgPage.java b/src/club/wpia/gigi/pages/orga/ViewOrgPage.java
index 909f9efe..6d7e9a2a 100644
--- a/src/club/wpia/gigi/pages/orga/ViewOrgPage.java
+++ b/src/club/wpia/gigi/pages/orga/ViewOrgPage.java
@@ -93,7 +93,7 @@ public class ViewOrgPage extends ManagedMultiFormPage {
             return;
         }
         Map<String, Object> vars = Page.getDefaultVars(req);
-        if (orgAss) {
+        if (orgAss && !myOrgs.contains(o)) {
             vars.put("editForm", new CreateOrgForm(req, o));
             vars.put("affForm", new AffiliationForm(req, o));
             vars.put("mgmDom", new DomainManagementForm(req, o, true));