From 56793afa5f340d2fbb9b0a5aecf571c941fe3d4c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 29 Aug 2017 23:53:20 +0200
Subject: [PATCH] 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
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../localization/bundle_de_DE.properties      |  3 --
 .../localization/bundle_en_US.properties      |  2 -
 .../form_data/fax/admin_form_fax_data.tpl     |  2 +-
 .../landline/admin_form_landline_data.tpl     |  2 +-
 .../mobile/admin_form_mobile_data.tpl         |  2 +-
 .../tags/admin/links/fax/admin_fax_links.tpl  | 52 +++++++++----------
 .../links/landline/admin_landline_links.tpl   | 16 +++---
 .../admin/links/mobile/admin_mobile_links.tpl | 50 +++++++++---------
 .../admin/panel_grids/fax/admin_fax_data.tpl  |  6 +--
 .../landline/admin_landline_data.tpl          |  8 ++-
 .../panel_grids/mobile/admin_mobile_data.tpl  |  6 +--
 .../resources/tags/messages/message_box.tpl   |  2 +-
 .../tags/profile/user/user_profile_link.tpl   |  2 -
 .../tags/table_rows/fax_input_table_row.tpl   |  2 +-
 .../table_rows/landline_input_table_row.tpl   |  2 +-
 .../table_rows/mobile_selection_table_row.tpl |  2 +-
 .../user_personal_title_table_row.tpl         |  2 +-
 .../user_profile_mode_table_row.tpl           |  2 +-
 web/WEB-INF/widgets.jsf.taglib.xml            | 36 +++++++++++++
 .../unlink/admin_contact_fax_unlink.xhtml     |  2 +-
 .../admin_contact_landline_unlink.xhtml       |  2 +-
 .../unlink/admin_contact_mobile_unlink.xhtml  |  2 +-
 22 files changed, 112 insertions(+), 93 deletions(-)

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index c1b9981b..2fa17c26 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -393,7 +393,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
@@ -447,9 +446,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 6bb2ea71..ba3f1eb8 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -377,7 +377,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
@@ -430,7 +429,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 4d773ad2..980c533e 100644
--- 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 8461e52e..ec1bf0a8 100644
--- 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 6e454c15..9e8571c3 100644
--- 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 c9bb240e..22ab97e7 100644
--- 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 ec0c7db3..426fcda1 100644
--- 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 fa27d6ee..eb5a81d0 100644
--- 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 622573d2..2c376018 100644
--- 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 8017577e..66a22eba 100644
--- 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 d936316a..4077b5fa 100644
--- 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 95b819ab..a68d361f 100644
--- 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 bc181b04..5c114779 100644
--- 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 2a7575f2..a6543fec 100644
--- 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 624ef2d9..f16751bb 100644
--- 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 3d6fc071..9e981a08 100644
--- 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 025265be..387a7235 100644
--- 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 b51146ab..96d53b29 100644
--- 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 11287cce..2bcbbc6a 100644
--- 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 34f45fa8..0efea096 100644
--- 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 56fb32cf..8dee96bb 100644
--- 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 9113e569..1e899794 100644
--- 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">
-- 
2.39.5