From: Roland Häder <roland@mxchange.org>
Date: Sun, 24 Jun 2018 21:48:40 +0000 (+0200)
Subject: Product-only:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9eb36c0336210c5fd3560efbaf37c92372e8ada2;p=jfinancials-war.git

Product-only:
- if no product number is assigned, don't leave the box empty and show a proper message

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

diff --git a/src/java/org/mxchange/localization/project_de_DE.properties b/src/java/org/mxchange/localization/project_de_DE.properties
index b9c5a808..adc0b337 100644
--- a/src/java/org/mxchange/localization/project_de_DE.properties
+++ b/src/java/org/mxchange/localization/project_de_DE.properties
@@ -369,3 +369,4 @@ RECEIPT_REGISTER_NUMBER_HEADER=Kassennummer:
 RECEIPT_REGISTER_NUMBER_TITLE=Kassenummer des Kassenbons.
 ADMIN_PRODUCT_NUMBER_HEADER=Produktnummer:
 RECEIPT_NO_BARCODE_ASSIGNED=Dem Kassenbon wurde kein Barcode zugewiesen.
+NO_PRODUCT_NUMBER_ASSIGNED=Keine Produktnummer zugewiesen.
diff --git a/src/java/org/mxchange/localization/project_en_US.properties b/src/java/org/mxchange/localization/project_en_US.properties
index 16f4c150..aa106f1b 100644
--- a/src/java/org/mxchange/localization/project_en_US.properties
+++ b/src/java/org/mxchange/localization/project_en_US.properties
@@ -275,3 +275,4 @@ RECEIPT_REGISTER_NUMBER_HEADER=Register number:
 RECEIPT_REGISTER_NUMBER_TITLE=Register's number of receipt.
 ADMIN_PRODUCT_NUMBER_HEADER=Product number:
 RECEIPT_NO_BARCODE_ASSIGNED=No barcode has been assigned to the receipt.
+NO_PRODUCT_NUMBER_ASSIGNED=No product number assigned.
diff --git a/web/admin/generic_product/admin_generic_product_list.xhtml b/web/admin/generic_product/admin_generic_product_list.xhtml
index 72de737b..10d94c30 100644
--- a/web/admin/generic_product/admin_generic_product_list.xhtml
+++ b/web/admin/generic_product/admin_generic_product_list.xhtml
@@ -90,7 +90,8 @@
 				</p:column>
 
 				<p:column headerText="#{project.ADMIN_PRODUCT_NUMBER_HEADER}" sortBy="#{product.productNumber}" filterBy="#{product.productNumber}" filterMatchMode="contains">
-					<h:outputText value="#{product.productNumber}" />
+					<h:outputText value="#{product.productNumber}" rendered="#{not empty product.productNumber}" />
+					<h:outputText value="-" rendered="#{empty product.productNumber}" />
 				</p:column>
 
 				<p:column headerText="#{project.ADMIN_ASSIGNED_PRODUCT_CATEGORY_HEADER}" sortBy="#{product.productCategory}" filterBy="#{product.productCategory}" filterMatchMode="in">
@@ -193,7 +194,8 @@
 						<h:outputText value="#{productListController.selectedProduct.productI18nKey}" title="#{local[productListController.selectedProduct.productI18nKey]}" />
 
 						<p:outputLabel value="#{project.PRODUCT_NUMBER_HEADER}" title="#{project.PRODUCT_NUMBER_TITLE}" />
-						<h:outputText value="#{productListController.selectedProduct.productNumber}" />
+						<h:outputText value="#{productListController.selectedProduct.productNumber}" rendered="#{not empty productListController.selectedProduct.productNumber}" />
+						<h:outputText value="#{project.NO_PRODUCT_NUMBER_ASSIGNED}" rendered="#{empty productListController.selectedProduct.productNumber}" />
 
 						<p:outputLabel value="#{project.PRODUCT_AVAILABILITY_HEADER}" title="#{project.PRODUCT_AVAILABILITY_TITLE}" />
 						<h:outputText value="#{productListController.selectedProduct.productAvailability ? msg.CHOICE_YES : msg.CHOICE_NO}" />