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 3fd371eec24e47770887f61bcad3e131d71bf822..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,13 +11,12 @@
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam
-                               id="productId"
                                name="productId"
-                               value="#{adminGenericProductActionController.product}"
+                               value="#{adminGenericProductActionController.currentProduct}"
                                converter="GenericProductConverter"
                                required="true"
-                               requiredMessage="#{project.ERROR_PARAMETER_PRODUCT_ID_NOT_SET}"
-                               converterMessage="#{project.PARAMETER_PRODUCT_ID_INVALID}"
+                               requiredMessage="#{product.ERROR_PARAMETER_PRODUCT_ID_NOT_SET}"
+                               converterMessage="#{product.PARAMETER_PRODUCT_ID_INVALID}"
                                />
 
                        <f:viewAction
@@ -28,21 +26,18 @@
        </ui:define>
 
        <ui:define name="document_admin_title">
-               <h:outputText value="#{project.PAGE_TITLE_ADMIN_GENERIC_PRODUCT_EDIT}" />
+               <h:outputText value="#{product.PAGE_TITLE_ADMIN_GENERIC_PRODUCT_EDIT}" />
        </ui:define>
 
        <ui:define name="content_header">
-               <h:outputText value="#{project.CONTENT_TITLE_ADMIN_GENERIC_PRODUCT_EDIT}" />
+               <h:outputText value="#{product.CONTENT_TITLE_ADMIN_GENERIC_PRODUCT_EDIT}" />
        </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
@@ -50,19 +45,21 @@
                                layout="grid"
                                >
                                <f:facet name="header">
-                                       <h:outputFormat value="#{project.ADMIN_EDIT_GENERIC_PRODUCT_TITLE}" title="#{local[adminGenericProductActionController.product.productI18nKey]}">
-                                               <f:param value="#{adminGenericProductActionController.product.productId}" />
+                                       <h:outputFormat
+                                               value="#{product.ADMIN_EDIT_GENERIC_PRODUCT_TITLE}"
+                                               title="#{local[adminGenericProductActionController.productI18nKey]}"
+                                               >
+                                               <f:param value="#{adminGenericProductActionController.productId}" />
                                        </h:outputFormat>
                                </f:facet>
 
                                <h:panelGroup styleClass="para" layout="block">
-                                       <h:outputText value="#{project.ADMIN_EDIT_GENERIC_PRODUCT_MINIMUM_DATA}" />
+                                       <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">
@@ -73,7 +70,7 @@
 
                                                <p:commandButton
                                                        type="submit"
-                                                       value="#{project.BUTTON_ADMIN_EDIT_GENERIC_PRODUCT}"
+                                                       value="#{product.BUTTON_ADMIN_EDIT_GENERIC_PRODUCT}"
                                                        action="#{adminGenericProductActionController.updateProduct()}"
                                                        />
                                        </p:panelGrid>