Please cherry-pick:

- added requiredMessage to countryI18nKey (resurrected?)
- no size="x" for such keys, including for department

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
index d4980f5381ab87e95d5952b0bfd4a134c9191098..b525f218d5ed1636c0ca49f1c6a1acb83f0704e2 100644 (file)
--- a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
+++ b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
@@ -56,7 +56,13 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText id="countryI18nKey" size="20" maxlength="100" value="#{adminCountryController.countryI18nKey}" required="true">
+                                       <p:inputText
+                                               id="countryI18nKey"
+                                               maxlength="100"
+                                               value="#{adminCountryController.countryI18nKey}"
+                                               required="true"
+                                               requiredMessage="#{msg.ADMIN_COUNTRY_I18N_KEY_REQUIRED}"
+                                               >
                                                <f:validateRegex for="countryI18nKey" pattern="[A-Z_]{2,}" />
                                        </p:inputText>
                                </div>

diff --git a/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl b/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl
index 47cfa8f99b8dada4d44268bf18c86189c594183e..bc7fb9c6a057eddd9a16734d47565534dba804c1 100644 (file)
--- a/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl
+++ b/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl
@@ -11,7 +11,13 @@
        <p:fieldset legend="#{msg.ADMIN_DEPARTMENT_LEGEND}">
                <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
                        <p:outputLabel for="departmentI18nKey" value="#{msg.ADMIN_ENTER_DEPARTMENT_I18N_KEY}" />
-                       <p:inputText id="departmentI18nKey" size="20" maxlength="255" value="#{adminDepartmentController.departmentI18nKey}" required="true" requiredMessage="#{msg.ADMIN_DEPARTMENT_I18N_KEY_REQUIRED}" />
+                       <p:inputText
+                               id="departmentI18nKey"
+                               maxlength="255"
+                               value="#{adminDepartmentController.departmentI18nKey}"
+                               required="true"
+                               requiredMessage="#{msg.ADMIN_DEPARTMENT_I18N_KEY_REQUIRED}"
+                               />
 
                        <p:outputLabel for="departmentCompany" value="#{msg.ADMIN_ASSIGN_DEPARTMENT_COMPANY}" />
                        <p:selectOneMenu