Product-only:

- if for example an employee is assigned to a company (basic_data) then always
  link the "show basic data" view and not the company's website URL
- fixed wrong bundle, have to be "project", "msg" is generic
- added missing i18n strings

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 dcbd7304bc914f7c453d68a2fce99df4795a6d07..6c915c0cbeb10e4c1946649f5bd19ff5c609e78b 100644 (file)
--- a/src/java/org/mxchange/localization/project_de_DE.properties
+++ b/src/java/org/mxchange/localization/project_de_DE.properties
@@ -123,10 +123,18 @@ TABLE_SUMMARY_ADMIN_LIST_GENERIC_PRODUCTS=Diese Tabelle listet alle eingetragene
 #@TODO Please fix German umlauts!
 ADMIN_EMPTY_LIST_GENERIC_PRODUCTS=Es befinden sich keine Produkte in der Datenbank. Oder Ihre Suche ergab keine Uebereinstimmungen.
 ADMIN_LINK_SHOW_GENERIC_PRODUCT_TITLE=Zeigt Daten des Produktes an.
+#@TODO Please fix German umlauts!
+ADMIN_LINK_EDIT_GENERIC_PRODUCT_TITLE=Aendert Daten des Produktes ab.
+#@TODO Please fix German umlauts!
+ADMIN_LINK_DELETE_GENERIC_PRODUCT_TITLE=Loescht das Produkt aus der Datenbank.
 ADMIN_ASSIGNED_PRODUCT_CATEGORY_HEADER=Zugewiesene Produktkategorie:
 LABEL_PRODUCT_CATEGORIES=Produktkategorien
 FILTER_BY_MULTIPLE_PRODUCT_CATEGORIES_TITLE=Liste durch Auswahl von ein oder mehr Produktkategorien filtern.
 ADMIN_LINK_SHOW_GENERIC_PRODUCT_CATEGORY_TITLE=Zeigt Daten der Produktkategorie an.
+#@TODO Please fix German umlauts!
+ADMIN_LINK_EDIT_GENERIC_PRODUCT_CATEGORY_TITLE=Aendert Daten der Produktkategorie ab.
+#@TODO Please fix German umlauts!
+ADMIN_LINK_DELETE_GENERIC_PRODUCT_CATEGORY_TITLE=Loescht die Produktkategorie aus der Datenbank.
 ADMIN_PRODUCT_GROSS_PRICE_HEADER=Bruttopreis:
 #@TODO Please fix German umlauts!
 PRODUCT_AVAILABILITY_HEADER=Produkt verfuegbar:
@@ -272,7 +280,7 @@ PRODUCT_TAX_RATE_TITLE=Steuersatz des Produktes
 PRODUCT_NUMBER_HEADER=Produktnummer:
 PRODUCT_NUMBER_TITLE=Nummer des Produktes
 #@TODO Please fix German umlauts!
-PRODUCT_SIZE_HEADER=Produktgroesse
+PRODUCT_SIZE_HEADER=Produktgroesse:
 PRODUCT_UNIT_AMOUNT_HEADER=Produktmenge:
 PRODUCT_UNIT_AMOUNT_TITLE=Mengenangabe des Produktes
 #@TODO Please fix German umlauts!

diff --git a/src/java/org/mxchange/localization/project_en_US.properties b/src/java/org/mxchange/localization/project_en_US.properties
index 235104555a9e57c14cbfe7a0711edff5f20c61d5..6c74958974bb92b80f8a3d5eac821923d3928701 100644 (file)
--- a/src/java/org/mxchange/localization/project_en_US.properties
+++ b/src/java/org/mxchange/localization/project_en_US.properties
@@ -93,10 +93,14 @@ CONTENT_TITLE_ADMIN_LIST_GENERIC_PRODUCT=List products:
 TABLE_SUMMARY_ADMIN_LIST_GENERIC_PRODUCTS=This table lists all products.
 ADMIN_EMPTY_LIST_GENERIC_PRODUCTS=There are no products in database. Or your search criteria doesn't match anything.
 ADMIN_LINK_SHOW_GENERIC_PRODUCT_TITLE=Shows product data.
+ADMIN_LINK_EDIT_GENERIC_PRODUCT_TITLE=Edits product data.
+ADMIN_LINK_DELETE_GENERIC_PRODUCT_TITLE=Deletes product data.
 ADMIN_ASSIGNED_PRODUCT_CATEGORY_HEADER=Assigned product category:
 LABEL_PRODUCT_CATEGORIES=Product categories
 FILTER_BY_MULTIPLE_PRODUCT_CATEGORIES_TITLE=Filter list by selecting one or more product categories.
 ADMIN_LINK_SHOW_GENERIC_PRODUCT_CATEGORY_TITLE=Shows product category data.
+ADMIN_LINK_EDIT_GENERIC_PRODUCT_CATEGORY_TITLE=Edits product category data.
+ADMIN_LINK_DELETE_GENERIC_PRODUCT_CATEGORY_TITLE=Deletes product category data.
 ADMIN_PRODUCT_GROSS_PRICE_HEADER=Gross price:
 PRODUCT_AVAILABILITY_HEADER=Product available:
 ADMIN_ADD_GENERIC_PRODUCT_TITLE=Add new product
@@ -199,7 +203,7 @@ PRODUCT_TAX_RATE_HEADER=Tax rate:
 PRODUCT_TAX_RATE_TITLE=Tax rate of product
 PRODUCT_NUMBER_HEADER=Product number:
 PRODUCT_NUMBER_TITLE=Number of product
-PRODUCT_SIZE_HEADER=Product size
+PRODUCT_SIZE_HEADER=Product size:
 PRODUCT_UNIT_AMOUNT_HEADER=Product amount:
 PRODUCT_UNIT_AMOUNT_TITLE=Amount of product
 PRODUCT_UNIT_I18N_KEY_HEADER=Internationalization key for unit:

diff --git a/web/WEB-INF/resources/tags/admin/links/mini/generic_product/admin_generic_product_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/generic_product/admin_generic_product_links.tpl
index 4ac5d9f7453ed1d958011ca5cee61fe3fb2d53a4..82c8259945f675799fa54498f1bbaaf412f73bc7 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/links/mini/generic_product/admin_generic_product_links.tpl
+++ b/web/WEB-INF/resources/tags/admin/links/mini/generic_product/admin_generic_product_links.tpl
@@ -10,21 +10,21 @@
                <ul class="navbar-mini">
                        <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
                                <li class="navlink-mini">
-                                       <p:link outcome="admin_show_generic_product" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_GENERIC_PRODUCT_TITLE}">
+                                       <p:link outcome="admin_show_generic_product" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{project.ADMIN_LINK_SHOW_GENERIC_PRODUCT_TITLE}">
                                                <f:param name="productId" value="#{product.productId}" />
                                        </p:link>
                                </li>
                        </ui:fragment>
 
                        <li class="navlink-mini">
-                               <p:link outcome="admin_edit_generic_product" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_GENERIC_PRODUCT_TITLE}">
+                               <p:link outcome="admin_edit_generic_product" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{project.ADMIN_LINK_EDIT_GENERIC_PRODUCT_TITLE}">
                                        <f:param name="productId" value="#{product.productId}" />
                                </p:link>
                        </li>
 
                        <li class="navlink-mini">
                                <p:link outcome="admin_delete_generic_product">
-                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_GENERIC_PRODUCT_TITLE}" />
+                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{project.ADMIN_LINK_DELETE_GENERIC_PRODUCT_TITLE}" />
                                        <f:param name="productId" value="#{product.productId}" />
                                </p:link>
                        </li>

diff --git a/web/WEB-INF/resources/tags/admin/links/mini/product_category/admin_product_category_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/product_category/admin_product_category_links.tpl
index b988c21c10eb8bdef80c0c072186717a3d9d958f..d606bd3b7b2233330df763a1bc31f7bbdfa37e69 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/links/mini/product_category/admin_product_category_links.tpl
+++ b/web/WEB-INF/resources/tags/admin/links/mini/product_category/admin_product_category_links.tpl
@@ -10,21 +10,21 @@
                <ul class="navbar-mini">
                        <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
                                <li class="navlink-mini">
-                                       <p:link outcome="admin_show_product_category" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_PRODUCT_CATEGORY_TITLE}">
+                                       <p:link outcome="admin_show_product_category" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{project.ADMIN_LINK_SHOW_PRODUCT_CATEGORY_TITLE}">
                                                <f:param name="categoryId" value="#{category.categoryId}" />
                                        </p:link>
                                </li>
                        </ui:fragment>
 
                        <li class="navlink-mini">
-                               <p:link outcome="admin_edit_product_category" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_PRODUCT_CATEGORY_TITLE}">
+                               <p:link outcome="admin_edit_product_category" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{project.ADMIN_LINK_EDIT_PRODUCT_CATEGORY_TITLE}">
                                        <f:param name="categoryId" value="#{category.categoryId}" />
                                </p:link>
                        </li>
 
                        <li class="navlink-mini">
                                <p:link outcome="admin_delete_product_category">
-                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_PRODUCT_CATEGORY_TITLE}" />
+                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{project.ADMIN_LINK_DELETE_PRODUCT_CATEGORY_TITLE}" />
                                        <f:param name="categoryId" value="#{category.categoryId}" />
                                </p:link>
                        </li>

diff --git a/web/admin/generic_product/admin_generic_product_list.xhtml b/web/admin/generic_product/admin_generic_product_list.xhtml
index e6f81fadaee67e14aafc8c30c94c87c5830e435d..d98d5da2554b3b4ba02e4a66939df1f16cd69a7d 100644 (file)
--- a/web/admin/generic_product/admin_generic_product_list.xhtml
+++ b/web/admin/generic_product/admin_generic_product_list.xhtml
@@ -128,18 +128,10 @@
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
-                                       <p:link
-                                               href="#{product.productManufacturer.companyWebsiteUrl}"
-                                               target="_blank"
-                                               title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}"
-                                               rel="external"
-                                               rendered="#{not empty product.productManufacturer and not empty product.productManufacturer.companyWebsiteUrl}"
-                                               >
-                                               <h:outputText value="#{product.productManufacturer.companyName}" />
+                                       <p:link outcome="admin_show_basic_data" value="#{beanHelper.renderBasicData(product.productManufacturer)}" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}" rendered="#{not empty product.productManufacturer}">
+                                               <f:param name="basicDataId" value="#{product.productManufacturer.basicDataId}" />
                                        </p:link>
 
-                                       <h:outputText value="#{product.productManufacturer.companyName}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{not empty product.productManufacturer and empty product.productManufacturer.companyWebsiteUrl}" />
-
                                        <h:outputText value="#{msg.ADMIN_NOT_ASSIGNED}" title="#{project.ADMIN_NO_PRODUCT_MANUFACTURER_ASSIGNED_TITLE}" rendered="#{empty product.productManufacturer}" />
                                </p:column>