X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Forga%2FCreateOrgForm.java;h=36bbbe8e511c23ac168891b886f79d6db376349f;hb=cc23db343f69bfc0c5ef72b0627254ae5389e441;hp=5f0b47746d5cada6835fcc62bbbc4a4931334fbf;hpb=5ba19c21224ab3bf365ed803497f940cc995117b;p=gigi.git diff --git a/src/org/cacert/gigi/pages/orga/CreateOrgForm.java b/src/org/cacert/gigi/pages/orga/CreateOrgForm.java index 5f0b4774..36bbbe8e 100644 --- a/src/org/cacert/gigi/pages/orga/CreateOrgForm.java +++ b/src/org/cacert/gigi/pages/orga/CreateOrgForm.java @@ -6,8 +6,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.dbObjects.CountryCode; -import org.cacert.gigi.dbObjects.CountryCode.CountryCodeType; +import org.cacert.gigi.dbObjects.Country; import org.cacert.gigi.dbObjects.Organisation; import org.cacert.gigi.email.EmailProvider; import org.cacert.gigi.localisation.Language; @@ -50,13 +49,7 @@ public class CreateOrgForm extends Form { result = t; o = t.getName(); - CountryCode orgState = null; - try { - orgState = CountryCode.getCountryCode(t.getState(), CountryCodeType.CODE_2_CHARS); - } catch (GigiApiException e) { - throw new Error(e); - } - cs = new CountrySelector("C", false, orgState); + cs = new CountrySelector("C", false, t.getState()); st = t.getProvince(); l = t.getCity();