Please cherry-pick:

- added optional parameter "contact" to many custom JSF tags
- removed no longer needed error messages as the template has become a custom
  JSF tag
- still having some StackoverflowError e.g. in view admin_landline_show.xhtml

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

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 2ba87eccf3a9def853863433e2009eeacad19b09..328ea08c96cf793a49839e7440b3bab79bf476a1 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -375,7 +375,6 @@ ADMIN_SHOW_PHONE_ID=Id-Nummer:
 ADMIN_SHOW_MOBILE_PROVIDER_NAME=Mobilanbieter:
 ADMIN_SHOW_MOBILE_NUMBER_COMPLETE=Komplette Nummer:
 ADMIN_SHOW_ADMINISTRATIVE_LINKS=Administrative Links:
-ERROR_PARAMETER_USER_NOT_SET=Fehler: Parameter 'user' nicht gesetzt.
 ADMIN_LINK_SHOW_SHORT=Anzeigen
 ADMIN_LINK_SHOW_SHORT_TITLE=Eintrag einzelnt anzeigen.
 ADMIN_LINK_EDIT_SHORT=Editieren
@@ -429,9 +428,7 @@ ADMIN_LINK_SHOW_CONTACT_DATA_TITLE=Kontaktdaten anzeigen
 ADMIN_MENU_CONTACT_TITLE=Kontaktdaten
 LINK_ADMIN_LIST_CONTACT=Kontaktdaten auflisten
 LINK_ADMIN_LIST_CONTACT_TITLE=Listet alle Kontaktdaten auf, egal wo her sie angelegt wurden.
-ERROR_PARAMETER_MOBILE_NUMBER_CONTACT_NOT_SET=Fehler: Parameter 'mobileNumber' und 'contact' nicht gesetzt.
 ADMIN_ADD_CONTACT_MINIMUM_DATA=Bitte geben Sie mindestens Anrede, Vorname und Nachname an.
-ERROR_PARAMETER_CONTACT_NOT_SET=Fehler: Parameter 'contact' nicht gesetzt.
 ADMIN_HEADER_SHOW_CONTACT=Kontaktdaten f\u00fcr {0}:
 ADMIN_CONTACT_UPDATED=Kontaktdaten aktualisiert:
 ADMIN_LINK_DELETE_CONTACT=Kontaktdaten l\u00f6schen

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 8e848db5497ecf67d673bd8dd2cab343ff885bcf..fdc24c02e4f460e06eb66459c9f57494f12d4e89 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -354,7 +354,6 @@ ADMIN_SHOW_PHONE_ID=Id number:
 ADMIN_SHOW_MOBILE_PROVIDER_NAME=Mobile provider:
 ADMIN_SHOW_MOBILE_NUMBER_COMPLETE=Complete number:
 ADMIN_SHOW_ADMINISTRATIVE_LINKS=Administrative links:
-ERROR_PARAMETER_USER_NOT_SET=Error: Parameter 'user' not set.
 ADMIN_LINK_SHOW_SHORT=Show
 ADMIN_LINK_SHOW_SHORT_TITLE=Show single entry.
 ADMIN_LINK_EDIT_SHORT=Edit
@@ -407,7 +406,6 @@ ADMIN_LINK_SHOW_CONTACT_DATA_TITLE=Show contact data
 ADMIN_MENU_CONTACT_TITLE=Manage contact data
 LINK_ADMIN_LIST_CONTACT=List contact data
 LINK_ADMIN_LIST_CONTACT_TITLE=Lists all contact data regardless where they was created.
-ERROR_PARAMETER_MOBILE_NUMBER_CONTACT_NOT_SET=Error: Parameter 'mobileNumber' and 'contact' are not set.
 ADMIN_ADD_CONTACT_MINIMUM_DATA=Please enter at least salutation, first name and family name.
 ERROR_PARAMETER_CONTACT_NOT_SET=Error: Parameter 'contact' is not set.
 ADMIN_HEADER_SHOW_CONTACT=Contact data for {0}:

diff --git a/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl
index 4d773ad24bb05e7ea4a1a4f32b83aa3435bdf2a7..980c533e3d6beb238ccff0c9f8271d39e8d6d768 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl
@@ -6,7 +6,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:panelGroup styleClass="para" layout="block" rendered="#{empty rendered or rendered}">
+       <h:panelGroup styleClass="para" layout="block" rendered="#{empty rendered or rendered == true}">
                <fieldset class="fieldset" id="fax_data">
                        <legend title="#{msg.ADMIN_FAX_NUMBER_DATA_LEGEND_TITLE}">
                                <h:outputText value="#{msg.ADMIN_FAX_NUMBER_DATA_LEGEND}" />

diff --git a/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl
index 8461e52e36a3627a091e4c3dc991b10c09229705..ec1bf0a849e016d4697574f7c21dc4492d74760d 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl
@@ -6,7 +6,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:panelGroup styleClass="para" layout="block" rendered="#{empty rendered or rendered}">
+       <h:panelGroup styleClass="para" layout="block" rendered="#{empty rendered or rendered == true}">
                <fieldset class="fieldset" id="landline_data">
                        <legend title="#{msg.ADMIN_LAND_LINE_NUMBER_DATA_LEGEND_TITLE}">
                                <h:outputText value="#{msg.ADMIN_LAND_LINE_NUMBER_DATA_LEGEND}" />

diff --git a/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl
index 6e454c15b87bbe7c298033e0e545ea11950c053f..9e8571c39bb5f7afa692de71a0d3c4140f0dcf44 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl
@@ -6,7 +6,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:panelGroup styleClass="para" layout="block" rendered="#{empty rendered or rendered}">
+       <h:panelGroup styleClass="para" layout="block" rendered="#{empty rendered or rendered == true}">
                <fieldset class="fieldset" id="mobile_data">
                        <legend title="#{msg.ADMIN_MOBILE_NUMBER_DATA_LEGEND_TITLE}">
                                <h:outputText value="#{msg.ADMIN_MOBILE_NUMBER_DATA_LEGEND}" />

diff --git a/web/WEB-INF/resources/tags/admin/links/fax/admin_fax_links.tpl b/web/WEB-INF/resources/tags/admin/links/fax/admin_fax_links.tpl
index c9bb240ecb325866b27fa28a28b43510aaa615e8..22ab97e797d35c0652f8f92c65795e6648f69c12 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/links/fax/admin_fax_links.tpl
+++ b/web/WEB-INF/resources/tags/admin/links/fax/admin_fax_links.tpl
@@ -6,40 +6,36 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
-
-       <ui:fragment rendered="#{not empty beanHelper.faxNumber}">
-               <ul class="navbar-mini">
-                       <ui:fragment rendered="#{empty isShowPage or not isShowPage}">
-                               <li class="navlink-mini">
-                                       <h:link outcome="admin_show_fax" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
-                                               <f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
-                                       </h:link>
-                               </li>
-                       </ui:fragment>
-
+       <ul class="navbar-mini">
+               <ui:fragment rendered="#{empty isShowPage or not isShowPage}">
                        <li class="navlink-mini">
-                               <h:link outcome="admin_edit_fax" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}">
-                                       <f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
+                               <h:link outcome="admin_show_fax" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
+                                       <f:param name="phoneId" value="#{faxNumber.phoneId}" />
                                </h:link>
                        </li>
+               </ui:fragment>
 
-                       <ui:fragment rendered="#{not empty beanHelper.contact}">
-                               <li class="navlink-mini">
-                                       <h:link outcome="admin_unlink_contact_fax">
-                                               <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
-                                               <f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
-                                               <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
-                                       </h:link>
-                               </li>
-                       </ui:fragment>
+               <li class="navlink-mini">
+                       <h:link outcome="admin_edit_fax" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}">
+                               <f:param name="phoneId" value="#{faxNumber.phoneId}" />
+                       </h:link>
+               </li>
 
+               <ui:fragment rendered="#{not empty contact}">
                        <li class="navlink-mini">
-                               <h:link outcome="admin_delete_fax">
-                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
-                                       <f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
+                               <h:link outcome="admin_unlink_contact_fax">
+                                       <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+                                       <f:param name="phoneId" value="#{faxNumber.phoneId}" />
+                                       <f:param name="contactId" value="#{contact.contactId}" />
                                </h:link>
                        </li>
-               </ul>
-       </ui:fragment>
+               </ui:fragment>
+
+               <li class="navlink-mini">
+                       <h:link outcome="admin_delete_fax">
+                               <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
+                               <f:param name="phoneId" value="#{faxNumber.phoneId}" />
+                       </h:link>
+               </li>
+       </ul>
 </ui:composition>

diff --git a/web/WEB-INF/resources/tags/admin/links/landline/admin_landline_links.tpl b/web/WEB-INF/resources/tags/admin/links/landline/admin_landline_links.tpl
index ec0c7db30164bdfafc7af6fe488e80f48578515a..426fcda1590a0106101bbd1c7c4aba05a32f226e 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/links/landline/admin_landline_links.tpl
+++ b/web/WEB-INF/resources/tags/admin/links/landline/admin_landline_links.tpl
@@ -6,30 +6,28 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
-
-       <ui:fragment rendered="#{not empty beanHelper.landLineNumber}">
+       <ui:fragment rendered="#{not empty landLineNumber}">
                <ul class="navbar-mini">
                        <ui:fragment rendered="#{empty isShowPage or not isShowPage}">
                                <li class="navlink-mini">
                                        <h:link outcome="admin_show_landline" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
-                                               <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
+                                               <f:param name="phoneId" value="#{landLineNumber.phoneId}" />
                                        </h:link>
                                </li>
                        </ui:fragment>
 
                        <li class="navlink-mini">
                                <h:link outcome="admin_edit_landline" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}">
-                                       <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
+                                       <f:param name="phoneId" value="#{landLineNumber.phoneId}" />
                                </h:link>
                        </li>
 
-                       <ui:fragment rendered="#{not empty beanHelper.contact}">
+                       <ui:fragment rendered="#{not empty contact}">
                                <li class="navlink-mini">
                                        <h:link outcome="admin_unlink_contact_landline">
                                                <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
-                                               <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
-                                               <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
+                                               <f:param name="phoneId" value="#{landLineNumber.phoneId}" />
+                                               <f:param name="contactId" value="#{contact.contactId}" />
                                        </h:link>
                                </li>
                        </ui:fragment>
@@ -37,7 +35,7 @@
                        <li class="navlink-mini">
                                <h:link outcome="admin_delete_landline">
                                        <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
-                                       <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
+                                       <f:param name="phoneId" value="#{landLineNumber.phoneId}" />
                                </h:link>
                        </li>
                </ul>

diff --git a/web/WEB-INF/resources/tags/admin/links/mobile/admin_mobile_links.tpl b/web/WEB-INF/resources/tags/admin/links/mobile/admin_mobile_links.tpl
index fa27d6eef78eec68c243cd75a6d8db51e357f1e3..eb5a81d022d3696bd19ffd454bc11617c4c959cb 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/links/mobile/admin_mobile_links.tpl
+++ b/web/WEB-INF/resources/tags/admin/links/mobile/admin_mobile_links.tpl
@@ -6,38 +6,36 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:fragment rendered="#{not empty beanHelper.mobileNumber}">
-               <ul class="navbar-mini">
-                       <ui:fragment rendered="#{empty isShowPage or not isShowPage}">
-                               <li class="navlink-mini">
-                                       <h:link outcome="admin_show_mobile" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
-                                               <f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
-                                       </h:link>
-                               </li>
-                       </ui:fragment>
-
+       <ul class="navbar-mini">
+               <ui:fragment rendered="#{empty isShowPage or not isShowPage}">
                        <li class="navlink-mini">
-                               <h:link outcome="admin_edit_mobile" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}">
-                                       <f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
+                               <h:link outcome="admin_show_mobile" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
+                                       <f:param name="phoneId" value="#{mobileNumber.phoneId}" />
                                </h:link>
                        </li>
+               </ui:fragment>
 
-                       <ui:fragment rendered="#{not empty beanHelper.contact}">
-                               <li class="navlink-mini">
-                                       <h:link outcome="admin_unlink_contact_mobile">
-                                               <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
-                                               <f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
-                                               <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
-                                       </h:link>
-                               </li>
-                       </ui:fragment>
+               <li class="navlink-mini">
+                       <h:link outcome="admin_edit_mobile" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}">
+                               <f:param name="phoneId" value="#{mobileNumber.phoneId}" />
+                       </h:link>
+               </li>
 
+               <ui:fragment rendered="#{not empty contact}">
                        <li class="navlink-mini">
-                               <h:link outcome="admin_delete_mobile">
-                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
-                                       <f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
+                               <h:link outcome="admin_unlink_contact_mobile">
+                                       <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+                                       <f:param name="phoneId" value="#{mobileNumber.phoneId}" />
+                                       <f:param name="contactId" value="#{contact.contactId}" />
                                </h:link>
                        </li>
-               </ul>
-       </ui:fragment>
+               </ui:fragment>
+
+               <li class="navlink-mini">
+                       <h:link outcome="admin_delete_mobile">
+                               <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
+                               <f:param name="phoneId" value="#{mobileNumber.phoneId}" />
+                       </h:link>
+               </li>
+       </ul>
 </ui:composition>

diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl
index 622573d213bdbd248fd4d9f38fc3f8e6fa374da5..2c376018140f21dcdd055c905d95d543f2d50880 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl
@@ -6,7 +6,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:panelGrid id="fax_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_FAX_NUMBER_DATA}" headerClass="table-header-column" styleClass="table table-medium" columns="2" rendered="#{empty rendered or rendered}">
+       <h:panelGrid id="fax_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_FAX_NUMBER_DATA}" headerClass="table-header-column" styleClass="table table-medium" columns="2" rendered="#{empty rendered or rendered == true}">
                <f:facet name="header">
                        <h:outputText value="#{msg.ADMIN_HEADER_SHOW_FAX_NUMBER_DATA}" />
                </f:facet>
@@ -43,11 +43,11 @@
                        </h:outputText>
                </h:column>
 
-               <h:column rendered="#{empty showAdminLinks or showAdminLinks}">
+               <h:column rendered="#{empty showAdminLinks or showAdminLinks == true}">
                        <h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
 
                        <div class="table-data-field">
-                               <widgets:outputAdminFaxLinks faxNumber="#{faxNumber}" isShowPage="#{isShowPage}" />
+                               <widgets:outputAdminFaxLinks faxNumber="#{faxNumber}" contact="#{contact}" isShowPage="#{isShowPage}" />
                        </div>
                </h:column>
        </h:panelGrid>

diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl
index 8017577e243e1502c8417479f0b4db553553cfaf..66a22eba1c997c2647fffb1ae63e3baa23c9f1be 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl
@@ -6,9 +6,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" />
-
-       <h:panelGrid id="landline_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_LAND_LINE_NUMBER_DATA}" headerClass="table-header-column" styleClass="table table-medium" columns="2" rendered="#{empty rendered or rendered}">
+       <h:panelGrid id="landline_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_LAND_LINE_NUMBER_DATA}" headerClass="table-header-column" styleClass="table table-medium" columns="2" rendered="#{empty rendered or rendered == true}">
                <f:facet name="header">
                        <h:outputText value="#{msg.ADMIN_HEADER_SHOW_LAND_LINE_NUMBER_DATA}" />
                </f:facet>
@@ -45,11 +43,11 @@
                        </h:outputText>
                </h:column>
 
-               <h:column rendered="#{empty showAdminLinks or showAdminLinks}">
+               <h:column rendered="#{empty showAdminLinks or showAdminLinks == true}">
                        <h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
 
                        <div class="table-data-field">
-                               <widgets:outputAdminLandLineLinks landLineNumber="#{landLineNumber}" isShowPage="#{isShowPage}" />
+                               <widgets:outputAdminLandLineLinks landLineNumber="#{landLineNumber}" contact="#{contact}" isShowPage="#{isShowPage}" />
                        </div>
                </h:column>
        </h:panelGrid>

diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl
index d936316a75798cf28b8c91886dd0ae250984fb3d..4077b5fa65e36bee04ec1e9865b271804a2cda06 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl
@@ -6,7 +6,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:panelGrid id="mobile_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_MOBILE_NUMBER_DATA}" headerClass="table-header-column" styleClass="table table-medium" columns="2" rendered="#{empty rendered or rendered}">
+       <h:panelGrid id="mobile_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_MOBILE_NUMBER_DATA}" headerClass="table-header-column" styleClass="table table-medium" columns="2" rendered="#{empty rendered or rendered == true}">
                <f:facet name="header">
                        <h:outputText value="#{msg.ADMIN_HEADER_SHOW_MOBILE_NUMBER_DATA}" />
                </f:facet>
@@ -52,11 +52,11 @@
                        </h:outputText>
                </h:column>
 
-               <h:column rendered="#{empty showAdminLinks or showAdminLinks}">
+               <h:column rendered="#{empty showAdminLinks or showAdminLinks == true}">
                        <h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
 
                        <div class="table-data-field">
-                               <widgets:outputAdminMobileLinks mobileNumber="#{mobileNumber}" isShowPage="#{isShowPage}" />
+                               <widgets:outputAdminMobileLinks mobileNumber="#{mobileNumber}" contact="#{contact}" isShowPage="#{isShowPage}" />
                        </div>
                </h:column>
        </h:panelGrid>

diff --git a/web/WEB-INF/resources/tags/messages/message_box.tpl b/web/WEB-INF/resources/tags/messages/message_box.tpl
index 95b819abece531e4c5e861c1a4aa0a7b3164227a..a68d361f87c02eb9555a88bf60c9ca5f8fdb1553 100644 (file)
--- a/web/WEB-INF/resources/tags/messages/message_box.tpl
+++ b/web/WEB-INF/resources/tags/messages/message_box.tpl
@@ -5,7 +5,7 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-       <h:panelGroup styleClass="message-container #{boxStyleClass}" layout="block" rendered="#{empty rendered or rendered}">
+       <h:panelGroup styleClass="message-container #{boxStyleClass}" layout="block" rendered="#{empty rendered or rendered == true}">
                <div class="message-header">
                        <h:outputText value="#{msg.MESSAGE_BOX_TITLE}" />
                </div>

diff --git a/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl b/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl
index bc181b04ed733e01b9ef9e30bdc06987dc4a3d7b..5c11477900fad63ca28ef3b25ee954f05d87c3f7 100644 (file)
--- a/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl
+++ b/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl
@@ -6,8 +6,6 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_USER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty user}" />
-
        <widgets:outputMessageBox message="#{msg.USER_PROFILE_NOT_PUBLICLY_VISIBLE}" boxStyleClass="message-mini" messageStyleClass="notice" rendered="#{not empty user and not profileController.isProfileLinkVisibleByUser(user)}" />
 
        <h:link outcome="user_profile" title="#{msg.LINK_USER_PROFILE_TITLE}" rendered="#{not empty user and profileController.isProfileLinkVisibleByUser(user)}">

diff --git a/web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl
index 2a7575f2893fdfcb5ba0fc63405f7cb6ed5c64c0..a6543fecaaa4e6d0db4ce8740bf265178a4c8815 100644 (file)
--- a/web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl
+++ b/web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl
@@ -6,7 +6,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:fragment rendered="#{empty rendered or rendered}">
+       <ui:fragment rendered="#{empty rendered or rendered == true}">
                <h:panelGroup styleClass="table-row" layout="block">
                        <div class="table-left-medium">
                                <h:outputLabel for="faxNumber" value="#{labelMessage}" />

diff --git a/web/WEB-INF/resources/tags/table_rows/landline_input_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/landline_input_table_row.tpl
index 624ef2d9e32c84756031117e0f363709a96b14e2..f16751bb78d069f001e394a48ca0c2c891709c67 100644 (file)
--- a/web/WEB-INF/resources/tags/table_rows/landline_input_table_row.tpl
+++ b/web/WEB-INF/resources/tags/table_rows/landline_input_table_row.tpl
@@ -6,7 +6,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:fragment rendered="#{empty rendered or rendered}">
+       <ui:fragment rendered="#{empty rendered or rendered == true}">
                <h:panelGroup styleClass="table-row" layout="block">
                        <div class="table-left-medium">
                                <h:outputLabel for="landLineNumber" value="#{labelMessage}" />

diff --git a/web/WEB-INF/resources/tags/table_rows/mobile_selection_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/mobile_selection_table_row.tpl
index 3d6fc07154b663831f904d4b8cd41d0ddf3a9d6f..9e981a08b2ff4922ab4e111fc60ae40c057bf928 100644 (file)
--- a/web/WEB-INF/resources/tags/table_rows/mobile_selection_table_row.tpl
+++ b/web/WEB-INF/resources/tags/table_rows/mobile_selection_table_row.tpl
@@ -6,7 +6,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:fragment rendered="#{empty rendered or rendered}">
+       <ui:fragment rendered="#{empty rendered or rendered == true}">
                <h:panelGroup styleClass="table-row" layout="block">
                        <div class="table-left-medium">
                                <h:outputLabel for="mobileNumber" value="#{labelMessage}" />

diff --git a/web/WEB-INF/resources/tags/table_rows/user_personal_title_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/user_personal_title_table_row.tpl
index 025265be262e0d4cf1a9d1f1df9b71af97320d8c..387a72353175bec9a1beb7d708cfc18c7c838f56 100644 (file)
--- a/web/WEB-INF/resources/tags/table_rows/user_personal_title_table_row.tpl
+++ b/web/WEB-INF/resources/tags/table_rows/user_personal_title_table_row.tpl
@@ -6,7 +6,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:fragment rendered="#{empty rendered or rendered}">
+       <ui:fragment rendered="#{empty rendered or rendered == true}">
                <h:panelGroup styleClass="table-row" layout="block">
                        <div class="table-left-medium">
                                <h:outputLabel for="userPersonalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />

diff --git a/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl
index b51146ab4ada7a4ede59d0aff4baef6aefa63b9a..96d53b29872b54837ed8cd5e1fff5d0fc76fcbb7 100644 (file)
--- a/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl
+++ b/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl
@@ -6,7 +6,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <ui:fragment rendered="#{empty rendered or rendered}">
+       <ui:fragment rendered="#{empty rendered or rendered == true}">
                <h:panelGroup styleClass="table-row" layout="block">
                        <div class="table-left-medium">
                                <h:outputLabel for="profileMode" value="#{labelMessage}" />

diff --git a/web/WEB-INF/widgets.jsf.taglib.xml b/web/WEB-INF/widgets.jsf.taglib.xml
index 11287cce25ee2730cc225c3bb2f474c9365c83ba..2bcbbc6a1e75861d885edd9bc9a1a44ba20b7671 100644 (file)
--- a/web/WEB-INF/widgets.jsf.taglib.xml
+++ b/web/WEB-INF/widgets.jsf.taglib.xml
@@ -227,6 +227,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                        <required>true</required>
                        <type>org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber</type>
                </attribute>
+               <attribute>
+                       <name>contact</name>
+                       <description>The contact instance that provides contact data for additional JSF links.</description>
+                       <required>false</required>
+                       <type>org.mxchange.jcontacts.contact.Contact</type>
+               </attribute>
                <attribute>
                        <name>rendered</name>
                        <description>Whether this tag is being rendered by JSF engine.</description>
@@ -256,6 +262,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                        <required>true</required>
                        <type>org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber</type>
                </attribute>
+               <attribute>
+                       <name>contact</name>
+                       <description>The contact instance that provides contact data for additional JSF links.</description>
+                       <required>false</required>
+                       <type>org.mxchange.jcontacts.contact.Contact</type>
+               </attribute>
                <attribute>
                        <name>rendered</name>
                        <description>Whether this tag is being rendered by JSF engine.</description>
@@ -285,6 +297,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                        <required>true</required>
                        <type>org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber</type>
                </attribute>
+               <attribute>
+                       <name>contact</name>
+                       <description>The contact instance that provides contact data for additional JSF links.</description>
+                       <required>false</required>
+                       <type>org.mxchange.jcontacts.contact.Contact</type>
+               </attribute>
                <attribute>
                        <name>rendered</name>
                        <description>Whether this tag is being rendered by JSF engine.</description>
@@ -362,6 +380,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                        <required>true</required>
                        <type>org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber</type>
                </attribute>
+               <attribute>
+                       <name>contact</name>
+                       <description>The contact instance that provides contact data for additional JSF links.</description>
+                       <required>false</required>
+                       <type>org.mxchange.jcontacts.contact.Contact</type>
+               </attribute>
                <attribute>
                        <name>rendered</name>
                        <description>Whether this tag is being rendered by JSF engine.</description>
@@ -385,6 +409,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                        <required>true</required>
                        <type>org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber</type>
                </attribute>
+               <attribute>
+                       <name>contact</name>
+                       <description>The contact instance that provides contact data for additional JSF links.</description>
+                       <required>false</required>
+                       <type>org.mxchange.jcontacts.contact.Contact</type>
+               </attribute>
                <attribute>
                        <name>rendered</name>
                        <description>Whether this tag is being rendered by JSF engine.</description>
@@ -408,6 +438,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                        <required>true</required>
                        <type>org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber</type>
                </attribute>
+               <attribute>
+                       <name>contact</name>
+                       <description>The contact instance that provides contact data for additional JSF links.</description>
+                       <required>false</required>
+                       <type>org.mxchange.jcontacts.contact.Contact</type>
+               </attribute>
                <attribute>
                        <name>rendered</name>
                        <description>Whether this tag is being rendered by JSF engine.</description>

diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
index 34f45fa81fabf11f6624c4418ea60440ba71e300..0efea0961e65d9fc17b74a494fddaa1f0faad3c9 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
@@ -45,7 +45,7 @@
                                </div>
 
                                <div class="para">
-                                       <widgets:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" isShowPage="false" showAdminLinks="false" />
+                                       <widgets:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" contact="#{beanHelper.contact}" isShowPage="false" showAdminLinks="false" />
                                </div>
 
                                <div class="table-footer">

diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
index 56fb32cfbbc92d511960d4978da2ce36d856b9ec..8dee96bb53603cfb729f7738a0342bfe7e6bfe0c 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
@@ -43,7 +43,7 @@
                                </div>
 
                                <div class="para">
-                                       <widgets:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.landLineNumber}" isShowPage="false" showAdminLinks="false" />
+                                       <widgets:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.landLineNumber}" contact="#{beanHelper.contact}" isShowPage="false" showAdminLinks="false" />
                                </div>
 
                                <div class="table-footer">

diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
index 9113e5692a0d69acc2cd8d3b938c0eb47377a467..1e8997941c7e314a419e49819e66858183617656 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
@@ -43,7 +43,7 @@
                                </div>
 
                                <div class="para">
-                                       <widgets:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.mobileNumber}" isShowPage="false" showAdminLinks="false" />
+                                       <widgets:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.mobileNumber}" contact="#{beanHelper.contact}" isShowPage="false" showAdminLinks="false" />
                                </div>
 
                                <div class="table-footer">