X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Forga%2FAffiliationForm.java;h=cef4dc912e2c8d340483213227dd54caf3d1b0ad;hb=fab3ca9955f6fb5248e828bc7ca0ca919375f7c3;hp=ad988895b351d5c26e375813257ba881cbf5639c;hpb=133b7fedbff3ce8d5f4eb6d150e204f615862476;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/orga/AffiliationForm.java b/src/org/cacert/gigi/pages/orga/AffiliationForm.java
index ad988895..cef4dc91 100644
--- a/src/org/cacert/gigi/pages/orga/AffiliationForm.java
+++ b/src/org/cacert/gigi/pages/orga/AffiliationForm.java
@@ -42,6 +42,8 @@ public class AffiliationForm extends Form {
             if (byEmail != null && byEmail.canAssure()) {
                 o.addAdmin(byEmail, LoginPage.getUser(req), req.getParameter("master") != null);
                 return true;
+            } else {
+                out.println(Page.getLanguage(req).getTranslation("Requested user is not a RA Agent. We need a RA Agent here."));
             }
         }
         out.println(Page.getLanguage(req).getTranslation("No action could have been carried out."));
@@ -61,8 +63,8 @@ public class AffiliationForm extends Form {
                     return false;
                 }
                 Affiliation aff = iter.next();
-                vars.put("name", aff.getTarget().getName());
-                vars.put("master", aff.isMaster() ? l.getTranslation("master") : "");
+                vars.put("name", aff.getTarget().getPreferredName());
+                vars.put("master", aff.isMaster() ? l.getTranslation("Master") : "");
                 vars.put("e-mail", aff.getTarget().getEmail());
                 return true;
             }