Please cherry-pick:

- fixed component ids

diff --git a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
index 086d52c9133f4de9c0b413edd00224e7f5391853..b351539463fd0ab08697911e5ec97a7986f1586c 100644 (file)
--- a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
@@ -193,11 +193,11 @@
                                        </h:selectOneMenu>
 
                                        <h:inputText styleClass="input right_space" id="landLineAreaCode" size="5" maxlength="10" value="#{adminContactController.landLineAreaCode}">
-                                               <f:validator for="phoneAreaCode" validatorId="PhoneNumberValidator" />
+                                               <f:validator for="landLineAreaCode" validatorId="PhoneNumberValidator" />
                                        </h:inputText>
 
                                        <h:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{adminContactController.landLineNumber}">
-                                               <f:validator for="phoneNumber" validatorId="PhoneNumberValidator" />
+                                               <f:validator for="landLineNumber" validatorId="PhoneNumberValidator" />
                                        </h:inputText>
                                </div>
 

diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl
index af42442fc760b5c889fcc991cf681e8c745227cf..f39c43f1974a790f5b92aaa32935b9745a7e7d11 100644 (file)
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -198,7 +198,7 @@
 
                        <div class="table_row">
                                <div class="table_left_medium">
-                                       <h:outputLabel for="phoneNumber" value="#{msg.PERSONAL_DATA_PHONE_NUMBER}" />
+                                       <h:outputLabel for="landLineNumber" value="#{msg.PERSONAL_DATA_PHONE_NUMBER}" />
                                </div>
 
                                <div class="table_right_medium">

diff --git a/web/admin/fax/admin_fax_list.xhtml b/web/admin/fax/admin_fax_list.xhtml
index 2f621cc476ffa06ee3ccde27e2cca4de4ab1cac7..e6606f805efde6e80a13433f1df18f6dab011acc 100644 (file)
--- a/web/admin/fax/admin_fax_list.xhtml
+++ b/web/admin/fax/admin_fax_list.xhtml
@@ -31,10 +31,10 @@
 
                                <h:column>
                                        <f:facet name="header">
-                                               <h:outputLabel for="phoneNumber" value="#{msg.ADMIN_SHOW_PHONE_NUMBER}" />
+                                               <h:outputLabel for="faxNumber" value="#{msg.ADMIN_SHOW_PHONE_NUMBER}" />
                                        </f:facet>
 
-                                       <h:outputText id="phoneNumber" value="#{faxNumber.phoneCountry.countryAbroadDialPrefix}#{faxNumber.phoneCountry.countryPhoneCode} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}" />
+                                       <h:outputText id="faxNumber" value="#{faxNumber.phoneCountry.countryAbroadDialPrefix}#{faxNumber.phoneCountry.countryPhoneCode} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}" />
                                </h:column>
 
                                <h:column>