result = t;
o = t.getName();
- cs = new CountrySelector("C", false, t.getState());
+ cs = new CountrySelector("C", false, t.getCountry());
st = t.getProvince();
l = t.getCity();
}
@Override
- public boolean submit(HttpServletRequest req) throws GigiApiException {
+ public SubmissionResult submit(HttpServletRequest req) throws GigiApiException {
String action = req.getParameter("action");
if (action == null) {
- return false;
+ throw new GigiApiException("No action given.");
}
if (action.equals("new")) {
checkOrganisationData(req);
Organisation ne = new Organisation(o, cs.getCountry(), st, l, email, optionalName, postalAddress, LoginPage.getUser(req));
result = ne;
- return true;
} else if (action.equals("updateOrganisationData")) {
checkOrganisationData(req);
result.updateOrgData(email, optionalName, postalAddress);
- return true;
} else if (action.equals("updateCertificateData")) {
checkCertData(req);
result.updateCertData(o, cs.getCountry(), st, l);
- return true;
+ } else {
+ throw new GigiApiException("No valid action given.");
}
-
- return false;
+ return new RedirectResult(ViewOrgPage.DEFAULT_PATH + "/" + result.getId());
}
private void checkOrganisationData(HttpServletRequest req) throws GigiApiException {
return parameter.trim();
}
- public Organisation getResult() {
- return result;
- }
-
@Override
protected void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
vars.put("O", o);