]> git.mxchange.org Git - jfinancials-war.git/commitdiff
Product-only:
authorRoland Häder <roland@mxchange.org>
Sun, 24 Jun 2018 21:48:40 +0000 (23:48 +0200)
committerRoland Häder <roland@mxchange.org>
Sun, 24 Jun 2018 21:49:33 +0000 (23:49 +0200)
- 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>
src/java/org/mxchange/localization/project_de_DE.properties
src/java/org/mxchange/localization/project_en_US.properties
web/admin/generic_product/admin_generic_product_list.xhtml

index b9c5a808831566a468652eeedb1f6d703e5604a6..adc0b3375b4df6e5ad1c271f4615bcc5b865cd6b 100644 (file)
@@ -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.
index 16f4c150d5beb39345eb39489311675b372c208f..aa106f1bf9aebd6c43c90f0eb15d6c15ac427bd8 100644 (file)
@@ -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.
index 72de737b05ad50639b1cc097b50779d097c96172..10d94c302e3502a305928e20db66b42873d46f1d 100644 (file)
@@ -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">
                                                <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}" />