Author: vbriand Date: 2011-03-25 17:57:24 +0100 (Fri, 25 Mar 2011) New Revision: 46 Url: http://chorem.org/repositories/revision/chorem/46 Log: Added website for company Modified: trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addCompany.jsp Modified: trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java 2011-03-25 16:31:08 UTC (rev 45) +++ trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java 2011-03-25 16:57:24 UTC (rev 46) @@ -23,13 +23,15 @@ private static final String CONTACT_DETAILS_POSTAL_ADDRESS = "Postal address"; private static final String CONTACT_DETAILS_PHONE = "Phone number"; + + private static final String CONTACT_DETAILS_WEBSITE = "Website"; public String add() { String result = INPUT; if (name != null && type != null && addressLine1 != null && postcode != null && city != null && country != null && - phoneNb != null) { + phoneNb != null && website != null) { if (!name.isEmpty() && !type.isEmpty() && !addressLine1.isEmpty() && !postcode.isEmpty() && !city.isEmpty() && !country.isEmpty()) { @@ -52,6 +54,7 @@ protected String city; protected String country; protected String phoneNb; + protected String website; /** * Stores the new company through the proxy @@ -83,13 +86,25 @@ proxy.store(newCompany); proxy.store(newContactDetails); - newContactDetails = new ContactDetailsImpl(); - newContactDetails.setName(CONTACT_DETAILS_PHONE + " of company \"" + - name + "\""); - newContactDetails.setType(CONTACT_DETAILS_PHONE); - newContactDetails.setValue(phoneNb); - newContactDetails.setTarget(newCompany.getWikittyId()); - proxy.store(newContactDetails); + if (!phoneNb.isEmpty()) { + newContactDetails = new ContactDetailsImpl(); + newContactDetails.setName(CONTACT_DETAILS_PHONE + + " of company \"" + name + "\""); + newContactDetails.setType(CONTACT_DETAILS_PHONE); + newContactDetails.setValue(phoneNb); + newContactDetails.setTarget(newCompany.getWikittyId()); + proxy.store(newContactDetails); + } + + if (!website.isEmpty()) { + newContactDetails = new ContactDetailsImpl(); + newContactDetails.setName(CONTACT_DETAILS_WEBSITE + + " of company \"" + name + "\""); + newContactDetails.setType(CONTACT_DETAILS_WEBSITE); + newContactDetails.setValue(website); + newContactDetails.setTarget(newCompany.getWikittyId()); + proxy.store(newContactDetails); + } } catch (Exception e) { result = false; addActionError(getText(n_("chorem.bonzoms.company.create.error"))); @@ -209,4 +224,18 @@ public void setPhoneNb(String phoneNb) { this.phoneNb = phoneNb; } + + /** + * @return the website + */ + public String getWebsite() { + return website; + } + + /** + * @param website the website to set + */ + public void setWebsite(String website) { + this.website = website; + } } Modified: trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties =================================================================== --- trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-03-25 16:31:08 UTC (rev 45) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-03-25 16:57:24 UTC (rev 46) @@ -3,7 +3,7 @@ chorem.bonzoms.company.add=Add a new company chorem.bonzoms.company.addressLine1=Address line 1 chorem.bonzoms.company.addressLine1.required=You must enter the first address line -chorem.bonzoms.company.addressLine2=Address line 2 +chorem.bonzoms.company.addressLine2=Address line 2 (opt.) chorem.bonzoms.company.city=City chorem.bonzoms.company.city.required=You must enter the city chorem.bonzoms.company.country=Country @@ -11,11 +11,12 @@ chorem.bonzoms.company.create.error=An error occurred while creating your new company, please try again. If the problem persists, please contact an administrator chorem.bonzoms.company.name=Company''s name chorem.bonzoms.company.name.required=You must enter the company''s name -chorem.bonzoms.company.phoneNb=Phone number +chorem.bonzoms.company.phoneNb=Phone number (opt.) chorem.bonzoms.company.postcode=Postcode chorem.bonzoms.company.postcode.required=You must enter the postcode chorem.bonzoms.company.type=Company''s type chorem.bonzoms.company.type.required=You must enter the company''s type +chorem.bonzoms.company.website=Website (opt.) chorem.bonzoms.contactDetails=Contact details chorem.bonzoms.contactDetails.add=Add a new contact details chorem.bonzoms.contactDetails.create.error=An error occurred while creating your new contact details, please try again. If the problem persists, please contact an administrator Modified: trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties =================================================================== --- trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-03-25 16:31:08 UTC (rev 45) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-03-25 16:57:24 UTC (rev 46) @@ -3,7 +3,7 @@ chorem.bonzoms.company.add=Ajouter une nouvelle soci\u00E9t\u00E9 chorem.bonzoms.company.addressLine1=Adresse chorem.bonzoms.company.addressLine1.required=Vous devez donner l'adresse de l''entreprise -chorem.bonzoms.company.addressLine2=Adresse (ligne 2) +chorem.bonzoms.company.addressLine2=Adresse ligne 2 (opt.) chorem.bonzoms.company.city=Ville chorem.bonzoms.company.city.required=Vous devez renseigner la ville chorem.bonzoms.company.country=Pays @@ -11,11 +11,12 @@ chorem.bonzoms.company.create.error=Une erreur s''est produite lors de la cr\u00E9ation de votre nouvelle soci\u00E9t\u00E9, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur chorem.bonzoms.company.name=Nom de la soci\u00E9t\u00E9 chorem.bonzoms.company.name.required=Vous devez entrer le nom de la soci\u00E9t\u00E9 -chorem.bonzoms.company.phoneNb=Num\u00E9ro de t\u00E9l\u00E9phone +chorem.bonzoms.company.phoneNb=Num\u00E9ro de t\u00E9l\u00E9phone (opt.) chorem.bonzoms.company.postcode=Code postal chorem.bonzoms.company.postcode.required=Vous devez renseigner le code postal de la soci\u00E9t\u00E9 chorem.bonzoms.company.type=Type de la soci\u00E9t\u00E9 chorem.bonzoms.company.type.required=Vous devez entrer le type de la soci\u00E9t\u00E9 +chorem.bonzoms.company.website=Site internet (opt.) chorem.bonzoms.contactDetails=M\u00E9thode de contact chorem.bonzoms.contactDetails.add=Ajouter une nouvelle m\u00E9thode de contact chorem.bonzoms.contactDetails.create.error=Une erreur s''est produite lors de la cr\u00E9ation de votre nouvelle m\u00E9thode de contact, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addCompany.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addCompany.jsp 2011-03-25 16:31:08 UTC (rev 45) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addCompany.jsp 2011-03-25 16:57:24 UTC (rev 46) @@ -35,6 +35,8 @@ <br /> <s:textfield key="chorem.bonzoms.company.phoneNb" name="phoneNb" labelSeparator=": " /> <br /> + <s:textfield key="chorem.bonzoms.company.website" name="website" labelSeparator=": " /> + <br /> <s:submit key="chorem.bonzoms.company.add" name="submit" /> </fieldset> </s:form>