Don't cherry-pick:

- on a p:dataTable it is recommneded (to avoid JavaScript errors) to have both
  id and widgetVar named the same

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

diff --git a/web/WEB-INF/templates/admin/financial/receipt_item/admin_form_financial_receipt_item.tpl b/web/WEB-INF/templates/admin/financial/receipt_item/admin_form_financial_receipt_item.tpl
index b532b0c849ee5d8a1c855215fff8a8267d41e423..718bf5d00f97eb547c591c01af575a1d7bbea716 100644 (file)
--- a/web/WEB-INF/templates/admin/financial/receipt_item/admin_form_financial_receipt_item.tpl
+++ b/web/WEB-INF/templates/admin/financial/receipt_item/admin_form_financial_receipt_item.tpl
@@ -41,7 +41,7 @@
                                >
                                <f:converter converterId="GenericProductConverter" />
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-                               <f:selectItems value="#{productController.allProducts()}" var="product" itemValue="#{product}" itemLabel="#{beanHelper.renderGenericProduct(product)}" />
+                               <f:selectItems value="#{productListController.allProducts}" var="product" itemValue="#{product}" itemLabel="#{beanHelper.renderGenericProduct(product)}" />
                        </p:selectOneMenu>
 
                        <p:outputLabel for="itemManufacturer" value="#{project.SELECT_RECEIPT_ITEM_MANUFACTURER}" />
@@ -53,7 +53,7 @@
                                >
                                <f:converter converterId="BasicCompanyDataConverter" />
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                               <f:selectItems value="#{basicCompanyDataController.allBasicData()}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
+                               <f:selectItems value="#{basicDataListController.allBasicData}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
                        </p:selectOneMenu>
 
                        <p:outputLabel for="itemQuantity" value="#{project.ENTER_RECEIPT_ITEM_QUANTITY}" />

diff --git a/web/admin/financial/receipt/admin_receipt_list.xhtml b/web/admin/financial/receipt/admin_receipt_list.xhtml
index c8928c850ff466bde508ce52fa42f2bcaa57cf29..f6d3dfef090418ebfa9c17cd2988f2d375234288 100644 (file)
--- a/web/admin/financial/receipt/admin_receipt_list.xhtml
+++ b/web/admin/financial/receipt/admin_receipt_list.xhtml
@@ -20,7 +20,7 @@
        <ui:define name="content">
                <h:form id="form-list-financial-receipt">
                        <p:dataTable
-                               id="table-list-financial-receipt"
+                               id="receiptList"
                                var="receipt"
                                value="#{receiptController.allReceipts()}"
                                filteredValue="#{receiptController.filteredReceipts}"
@@ -42,7 +42,7 @@
 
                                                <h:panelGroup>
                                                        <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
-                                                       <p:columnToggler datasource="table-list-financial-receipt" trigger="toggler" />
+                                                       <p:columnToggler datasource="receiptList" trigger="toggler" />
                                                </h:panelGroup>
                                        </p:panelGrid >
                                </f:facet>
@@ -176,7 +176,7 @@
                                                type="submit"
                                                value="#{project.BUTTON_ADMIN_ADD_RECEIPT}"
                                                action="#{adminReceiptController.addReceipt()}"
-                                               update=":master:form-list-financial-receipt:table-list-financial-receipt"
+                                               update=":master:form-list-financial-receipt:receiptList"
                                                />
                                </p:panelGrid>
                        </p:panelGrid>

diff --git a/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml b/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
index bbc08f5c51c1e051f93800eb0da837a6a606a187..81c39951809b581061817e589087638af039ac96 100644 (file)
--- a/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
+++ b/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
@@ -21,7 +21,7 @@
        <ui:define name="content">
                <h:form id="form-list-financial-receipt-item">
                        <p:dataTable
-                               id="table-list-financial-receipt-item"
+                               id="receiptItemList"
                                var="receiptItem"
                                value="#{receiptItemController.allReceiptItems()}"
                                filteredValue="#{receiptItemController.filteredReceiptItems}"
@@ -44,7 +44,7 @@
 
                                                <h:panelGroup>
                                                        <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
-                                                       <p:columnToggler datasource="table-list-financial-receipt-item" trigger="toggler" />
+                                                       <p:columnToggler datasource="receiptItemList" trigger="toggler" />
                                                </h:panelGroup>
                                        </p:panelGrid >
                                </f:facet>
@@ -88,7 +88,7 @@
                                                        >
                                                        <f:converter converterId="GenericProductConverter" />
                                                        <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                                       <f:selectItems value="#{productController.allProducts()}" var="product" itemValue="#{product}" itemLabel="#{beanHelper.renderGenericProduct(product)}" />
+                                                       <f:selectItems value="#{productListController.allProducts}" var="product" itemValue="#{product}" itemLabel="#{beanHelper.renderGenericProduct(product)}" />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
@@ -108,7 +108,7 @@
                                                        title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}"
                                                        >
                                                        <f:converter converterId="BasicCompanyDataConverter" />
-                                                       <f:selectItems value="#{basicCompanyDataController.allBasicData()}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
+                                                       <f:selectItems value="#{basicDataListController.allBasicData}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
@@ -161,7 +161,7 @@
                                                type="submit"
                                                value="#{project.BUTTON_ADMIN_ADD_RECEIPT_TEM}"
                                                action="#{adminReceiptItemController.addReceiptItem()}"
-                                               update=":master:form-list-financial-receipt-item:table-list-financial-receipt-item"
+                                               update=":master:form-list-financial-receipt-item:receiptItemList"
                                                />
                                </p:panelGrid>
                        </p:panelGrid>