Product-only:

[jfinancials-war.git] / web / admin / generic_product / admin_generic_product_edit.xhtml

diff --git a/web/admin/generic_product/admin_generic_product_edit.xhtml b/web/admin/generic_product/admin_generic_product_edit.xhtml
index 3841ebbbc44f6c8abd82db7b07d75ec1bc2e6f0a..90a562c296af453c7efd389fcddebf652867541e 100644 (file)
--- a/web/admin/generic_product/admin_generic_product_edit.xhtml
+++ b/web/admin/generic_product/admin_generic_product_edit.xhtml
@@ -2,7 +2,6 @@
 <ui:composition
        template="/WEB-INF/templates/admin/admin_base.tpl"
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:product="http://mxchange.org/jsf/jproduct/widgets"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
@@ -12,9 +11,8 @@
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam
-                               id="productId"
                                name="productId"
-                               value="#{adminGenericProductActionController.product}"
+                               value="#{adminGenericProductActionController.currentProduct}"
                                converter="GenericProductConverter"
                                required="true"
                                requiredMessage="#{product.ERROR_PARAMETER_PRODUCT_ID_NOT_SET}"
@@ -36,13 +34,10 @@
        </ui:define>
 
        <ui:define name="content">
-               <p:message
-                       for="productId"
-                       showSummary="true"
-                       rendered="#{empty adminGenericProductActionController.product}"
-                       />
-
-               <h:form rendered="#{not empty adminGenericProductActionController.product}">
+               <h:form
+                       id="admin-form-edit-generic-product"
+                       rendered="#{not empty adminGenericProductActionController.currentProduct}"
+                       >
                        <h:inputHidden value="#{adminGenericProductActionController.productId}" />
 
                        <p:panelGrid
@@ -52,9 +47,9 @@
                                <f:facet name="header">
                                        <h:outputFormat
                                                value="#{product.ADMIN_EDIT_GENERIC_PRODUCT_TITLE}"
-                                               title="#{local[adminGenericProductActionController.product.productI18nKey]}"
+                                               title="#{local[adminGenericProductActionController.productI18nKey]}"
                                                >
-                                               <f:param value="#{adminGenericProductActionController.product.productId}" />
+                                               <f:param value="#{adminGenericProductActionController.productId}" />
                                        </h:outputFormat>
                                </f:facet>
 
@@ -62,10 +57,9 @@
                                        <h:outputText value="#{product.ADMIN_EDIT_GENERIC_PRODUCT_MINIMUM_DATA}" />
                                </h:panelGroup>
 
-                               <product:genericProductForm
-                                       targetController="#{adminGenericProductActionController}"
-                                       allowDuplicates="true"
-                                       />
+                               <ui:include src="/WEB-INF/templates/admin/generic_product/admin_form_generic_product_data.tpl">
+                                       <ui:param name="bypassDuplicateI18nKey" value="true" />
+                               </ui:include>
 
                                <f:facet name="footer">
                                        <p:panelGrid columns="2" layout="grid">