Please cherry-pick:

- opps, wrong code inserted ...

diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl
index ed8551ad899c3906d05f51feff67404e9f5b37b7..9b9bcbd4845b34c2e7066bcd52fe7dbb688662db 100644 (file)
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -266,18 +266,14 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:selectOneMenu styleClass="select right_space" id="countryPhoneCode" value="#{contactController.phoneCountry}">
-                                               <f:converter converterId="CountryConverter" />
+                                       <h:selectOneMenu styleClass="select right_space" id="mobileProvider" value="#{contactController.mobileProvider}">
+                                               <f:converter converterId="MobileProviderConverter" />
                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
+                                               <f:selectItems value="#{mobileProviderController.allMobileProvider()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
                                        </h:selectOneMenu>
 
-                                       <h:inputText styleClass="input right_space" id="faxAreaCode" size="5" maxlength="10" value="#{targetController.phoneAreaCode}">
-                                               <f:validator validatorId="PhoneNumberValidator" />
-                                       </h:inputText>
-
-                                       <h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{contactController.phoneNumber}">
-                                               <f:validator validatorId="PhoneNumberValidator" />
+                                       <h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{contactController.phoneNumber}">
+                                               <f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
                                        </h:inputText>
                                </div>