Change-Id: I708e9cda67d33a7a35b414b8d74a3d7ab204608d
import javax.servlet.http.HttpServletRequest;
import club.wpia.gigi.GigiApiException;
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;
import club.wpia.gigi.dbObjects.Organisation;
import club.wpia.gigi.dbObjects.Organisation.Affiliation;
import club.wpia.gigi.dbObjects.User;
return false;
}
Affiliation aff = iter.next();
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;
vars.put("master", aff.isMaster() ? l.getTranslation("Master") : "");
vars.put("e-mail", aff.getTarget().getEmail());
return true;
<td><?=$name?></td>
<td><?=$e-mail?></td>
<td><?=$master?></td>
<td><?=$name?></td>
<td><?=$e-mail?></td>
<td><?=$master?></td>
- <td><button class="btn btn-warning btn-confirm" data-confirm="<?=_Do you really want to delete the affiliation of ${name} (${e-mail}) to this organisation??>" data-reply="<?=_Cancel?>,<?=_Delete?>" type="submit" name="del" value="<?=$e-mail?>">X</button> </td>
+ <td><button class="btn btn-warning btn-confirm" data-confirm="<?=_Do you really want to delete the affiliation of ${nameString} (${e-mail}) to this organisation??>" data-reply="<?=_Cancel?>,<?=_Delete?>" type="submit" name="del" value="<?=$e-mail?>">X</button>
+ </td>