From: INOPIAE Date: Mon, 23 Sep 2019 04:21:17 +0000 (+0200) Subject: fix: adjust output to show delete button correct X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=fa6f1564892b1eb0262b4e8deb6785d5ab742eb2 fix: adjust output to show delete button correct Change-Id: I708e9cda67d33a7a35b414b8d74a3d7ab204608d --- diff --git a/src/club/wpia/gigi/pages/orga/AffiliationForm.java b/src/club/wpia/gigi/pages/orga/AffiliationForm.java index 1fd1c010..c9948627 100644 --- a/src/club/wpia/gigi/pages/orga/AffiliationForm.java +++ b/src/club/wpia/gigi/pages/orga/AffiliationForm.java @@ -8,6 +8,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import club.wpia.gigi.GigiApiException; +import club.wpia.gigi.dbObjects.Name; import club.wpia.gigi.dbObjects.Organisation; import club.wpia.gigi.dbObjects.Organisation.Affiliation; import club.wpia.gigi.dbObjects.User; @@ -64,7 +65,9 @@ public class AffiliationForm extends Form { return false; } Affiliation aff = iter.next(); - vars.put("name", aff.getTarget().getPreferredName()); + Name n = aff.getTarget().getPreferredName(); + vars.put("name", n); + vars.put("nameString", n.toString()); vars.put("master", aff.isMaster() ? l.getTranslation("Master") : ""); vars.put("e-mail", aff.getTarget().getEmail()); return true; diff --git a/src/club/wpia/gigi/pages/orga/AffiliationForm.templ b/src/club/wpia/gigi/pages/orga/AffiliationForm.templ index de3969b0..5d204b47 100644 --- a/src/club/wpia/gigi/pages/orga/AffiliationForm.templ +++ b/src/club/wpia/gigi/pages/orga/AffiliationForm.templ @@ -10,7 +10,8 @@ - + +