From: Roland Häder <roland@mxchange.org>
Date: Wed, 27 Apr 2016 14:25:53 +0000 (+0200)
Subject: Some JSF fiyxes:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=380f5894d349ea066dfd5a94f84ee9d5511a8893;p=pizzaservice-war.git

Some JSF fiyxes:
- id "cellphoneLinks" removed as it happens in a loop
- sometimes user is null, then user.userContact cannot be accessed and any attempts cause a NPE
- new error message ERROR_PARAMETER_CELLPHONE_NUMBER_USER_NOT_SET added (and used)
- added div tags for better showing error messages
---

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index bf50485e..cda53236 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -355,3 +355,4 @@ ADMIN_LINK_SHOW_CUSTOMER_TITLE=Kundendaten anzeigen
 ADMIN_MENU_CONTACT_TITLE=Manage contact data
 LINK_ADMIN_LIST_CONTACT=Kontaktdaten auflisten
 LINK_ADMIN_LIST_CONTACT_TITLE=Listet alle Kontaktdaten auf, egal wo her sie angelegt wurden.
+ERROR_PARAMETER_CELLPHONE_NUMBER_USER_NOT_SET=Fehler: Parameter 'cellphoneNumber' und 'user' nicht gesetzt.
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index f15472dc..20c3430c 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -356,3 +356,4 @@ ADMIN_LINK_SHOW_CUSTOMER_TITLE=Show customer 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_CELLPHONE_NUMBER_USER_NOT_SET=Error: Parameter 'cellphoneNumber' and 'user' are not set.
diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl
index 2f3ec755..854b15ec 100644
--- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl
+++ b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl
@@ -5,6 +5,10 @@
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
+	<ui:fragment rendered="#{empty cellphoneNumber and empty user}">
+		<h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_CELLPHONE_NUMBER_USER_NOT_SET}" />
+	</ui:fragment>
+
 	<ui:fragment rendered="#{empty cellphoneNumber and not empty user}">
 		<ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_cellphone.tpl">
 			<ui:param name="contact" value="#{user.userContact}" />
diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
index 47ce5c93..81d46fb1 100644
--- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
+++ b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
@@ -34,14 +34,23 @@
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="cellphoneLinks" styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_LINKS}" />
+			<h:outputLabel styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_LINKS}" />
 
 			<div class="data_field">
-				<ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl">
-					<ui:param name="cellphoneNumber" value="#{cellphoneNumber}" />
-					<ui:param name="contact" value="#{user.userContact}" />
-					<ui:param name="isShowPage" value="#{isShowPage}" />
-				</ui:include>
+				<ui:fragment rendered="#{not empty user}">
+					<ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl">
+						<ui:param name="cellphoneNumber" value="#{cellphoneNumber}" />
+						<ui:param name="contact" value="#{user.userContact}" />
+						<ui:param name="isShowPage" value="#{isShowPage}" />
+					</ui:include>
+				</ui:fragment>
+
+				<ui:fragment rendered="#{empty user}">
+					<ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl">
+						<ui:param name="cellphoneNumber" value="#{cellphoneNumber}" />
+						<ui:param name="isShowPage" value="#{isShowPage}" />
+					</ui:include>
+				</ui:fragment>
 			</div>
 		</h:column>
 	</h:panelGrid>
diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl
index abd24354..100bed17 100644
--- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl
+++ b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl
@@ -7,7 +7,7 @@
 
 	<h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_CELLPHONE_NUMBER_NOT_SET}" rendered="#{empty cellphoneNumber}" />
 
-	<ui:fragment id="cellphoneLinks" rendered="#{not empty cellphoneNumber}">
+	<ui:fragment rendered="#{not empty cellphoneNumber}">
 		<ul class="mini_nav">
 			<ui:fragment rendered="#{empty isShowPage or not isShowPage}">
 				<li class="mini_link">
diff --git a/web/admin/cellphone/admin_contact_cellphone_show.xhtml b/web/admin/cellphone/admin_contact_cellphone_show.xhtml
index c10bbfcf..fc67b5fe 100644
--- a/web/admin/cellphone/admin_contact_cellphone_show.xhtml
+++ b/web/admin/cellphone/admin_contact_cellphone_show.xhtml
@@ -74,9 +74,9 @@
 				</h:column>
 
 				<h:column>
-					<h:outputLabel for="cellphoneLinks" styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_UNLINK}" />
+					<h:outputLabel styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_UNLINK}" />
 
-					<div id="cellphoneLinks" class="data_field">
+					<div class="data_field">
 						<ul class="mini_nav">
 							<li class="mini_link">
 								<h:link outcome="admin_unlink_contact_cellphone">
diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
index 9d926375..ce271471 100644
--- a/web/admin/user/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -171,14 +171,18 @@
 				</h:column>
 			</h:panelGrid>
 
-			<ui:include src="/WEB-INF/templates/admin/user/admin_user_links.tpl">
-				<ui:param name="user" value="#{adminHelper.user}" />
-			</ui:include>
-
-			<ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl">
-				<ui:param name="cellphoneNumber" value="#{adminHelper.user.userContact.contactCellphoneNumber}" />
-				<ui:param name="user" value="#{adminHelper.user}" />
-			</ui:include>
+			<div>
+				<ui:include src="/WEB-INF/templates/admin/user/admin_user_links.tpl">
+					<ui:param name="user" value="#{adminHelper.user}" />
+				</ui:include>
+			</div>
+
+			<div>
+				<ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl">
+					<ui:param name="cellphoneNumber" value="#{adminHelper.user.userContact.contactCellphoneNumber}" />
+					<ui:param name="user" value="#{adminHelper.user}" />
+				</ui:include>
+			</div>
 		</ui:define>
 	</ui:composition>
 </html>