Product-only:

- ops, wrong property taken ...
- also filter productAvailability with "in" mode

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

diff --git a/web/admin/generic_product/admin_generic_product_list.xhtml b/web/admin/generic_product/admin_generic_product_list.xhtml
index 94511ae8d6da2c600ef1d43a10badb2411539536..478a2ad3cd49eb47668c684259bb79c98cbab163 100644 (file)
--- a/web/admin/generic_product/admin_generic_product_list.xhtml
+++ b/web/admin/generic_product/admin_generic_product_list.xhtml
@@ -5,7 +5,8 @@
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+                               xmlns:p="http://primefaces.org/ui"
+                               >
 
        <ui:define name="document_admin_title">
                <h:outputText value="#{project.PAGE_TITLE_ADMIN_LIST_GENERIC_PRODUCT}" />
@@ -77,14 +78,14 @@
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{project.ADMIN_HEADER_PRODUCT_GROSS_PRICE}" sortBy="#{product.productAvailability}" filterBy="#{product.productGrossPrice}" filterMatchMode="in">
+                               <p:column headerText="#{project.ADMIN_HEADER_PRODUCT_GROSS_PRICE}" sortBy="#{product.productGrossPrice}" filterBy="#{product.productGrossPrice}" filterMatchMode="in">
                                        <h:outputText value="#{product.productGrossPrice}">
                                                <!-- @TODO Hard-coded EUR again -->
                                                <f:convertNumber type="currency" currencyCode="EUR" />
                                        </h:outputText>
                                </p:column>
 
-                               <p:column headerText="#{project.ADMIN_HEADER_PRODUCT_AVAILABILITY}" sortBy="#{product.productAvailability}" filterBy="#{product.productAvailability}" filterMatchMode="equals">
+                               <p:column headerText="#{project.ADMIN_HEADER_PRODUCT_AVAILABILITY}" sortBy="#{product.productAvailability}" filterBy="#{product.productAvailability}" filterMatchMode="in">
                                        <h:outputText value="#{product.productAvailability ? msg.CHOICE_YES : msg.CHOICE_NO}" />
                                </p:column>