From: Roland Häder <roland@mxchange.org>
Date: Thu, 18 Aug 2016 09:21:33 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=57cb74cfb7c35b1a3dd70bec7be3a587c8562a85;p=jjobs-war.git

Please cherry-pick:
- fixed link outcomes
- fixed ids and template usage (was copy-paste mistake)
- opps, missed to use beanHelper in JSF template
---

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 841590f1..d23945fc 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -416,7 +416,7 @@
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_unlink_contact_fax</from-outcome>
-			<to-view-id>/admincontact/unlink/admin_contact_fax_unlink.xhtml</to-view-id>
+			<to-view-id>/admin/contact/unlink/admin_contact_fax_unlink.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_show_fax</from-outcome>
@@ -568,7 +568,7 @@
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/admincontact/unlink/admin_contact_fax_unlink.xhtml</from-view-id>
+		<from-view-id>/admin/contact/unlink/admin_contact_fax_unlink.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>admin_show_contact</from-outcome>
 			<to-view-id>/admin/contact/admin_contact_show.xhtml</to-view-id>
diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_data_columns.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_data_columns.tpl
index ffb964de..76203216 100644
--- a/web/WEB-INF/templates/admin/contact/admin_contact_data_columns.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_contact_data_columns.tpl
@@ -79,7 +79,7 @@
 	<h:column>
 		<h:outputLabel for="contactCountry" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_COUNTRY_CODE}" />
 
-		<h:outputText id="contactCountry" styleClass="table_data_field" value="#{contact.contactCountry.countryCode}" />
+		<h:outputText id="contactCountry" styleClass="table_data_field" value="#{beanHelper.contact.contactCountry.countryCode}" />
 	</h:column>
 
 	<h:column>
diff --git a/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl b/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl
index 01cf00ea..1b6bb5b5 100644
--- a/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl
@@ -11,7 +11,7 @@
 		<ul class="mini_nav">
 			<ui:fragment rendered="#{empty isShowPage or not isShowPage}">
 				<li class="mini_link">
-					<h:link outcome="admin_show_mobile">
+					<h:link outcome="admin_show_fax">
 						<h:outputText value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}" />
 						<f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
 					</h:link>
@@ -19,7 +19,7 @@
 			</ui:fragment>
 
 			<li class="mini_link">
-				<h:link outcome="admin_edit_mobile">
+				<h:link outcome="admin_edit_fax">
 					<h:outputText value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}" />
 					<f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
 				</h:link>
@@ -27,7 +27,7 @@
 
 			<ui:fragment rendered="#{not empty beanHelper.contact}">
 				<li class="mini_link">
-					<h:link outcome="admin_unlink_contact_mobile">
+					<h:link outcome="admin_unlink_contact_fax">
 						<h:outputText styleClass="unlink_link" 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}" />
@@ -36,7 +36,7 @@
 			</ui:fragment>
 
 			<li class="mini_link">
-				<h:link outcome="admin_delete_mobile">
+				<h:link outcome="admin_delete_fax">
 					<h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
 					<f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
 				</h:link>
diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
index 68ae1074..6d9a47bc 100644
--- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
@@ -20,7 +20,7 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<h:form id="form_unlink_contact_landline" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber == beanHelper.faxNumber}">
+			<h:form id="form_unlink_contact_fax" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber == beanHelper.faxNumber}">
 				<h:panelGroup styleClass="table" layout="block">
 					<div class="table_header">
 						<h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_FAX_NUMBER_TITLE}" />
@@ -38,14 +38,14 @@
 					</div>
 
 					<div class="para">
-						<ui:include src="/WEB-INF/templates/admin/landline/admin_landline_data.tpl">
+						<ui:include src="/WEB-INF/templates/admin/fax/admin_fax_data.tpl">
 							<ui:param name="isShowPage" value="#{false}" />
 							<ui:param name="showAdminLinks" value="#{false}" />
 						</ui:include>
 					</div>
 
 					<div class="table_footer">
-						<h:commandButton styleClass="unlink_button" type="submit" id="unlink_landline" value="#{msg.BUTTON_ADMIN_UNLINK_FAX_NUMBER}" action="#{adminContactPhoneController.unlinkFaxContactData()}" />
+						<h:commandButton styleClass="unlink_button" type="submit" id="unlink_fax" value="#{msg.BUTTON_ADMIN_UNLINK_FAX_NUMBER}" action="#{adminContactPhoneController.unlinkFaxContactData()}" />
 					</div>
 				</h:panelGroup>
 			</h:form>
diff --git a/web/admin/fax/admin_fax_delete.xhtml b/web/admin/fax/admin_fax_delete.xhtml
index fa603a2f..67b6c54e 100644
--- a/web/admin/fax/admin_fax_delete.xhtml
+++ b/web/admin/fax/admin_fax_delete.xhtml
@@ -19,14 +19,14 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<h:form id="form_delete_landline" rendered="#{not empty beanHelper.faxNumber}">
+			<h:form id="form_delete_fax" rendered="#{not empty beanHelper.faxNumber}">
 				<h:panelGroup styleClass="table" layout="block">
 					<div class="table_header">
 						<h:outputText value="#{msg.ADMIN_DELETE_FAX_TITLE}" />
 					</div>
 
 					<div class="para">
-						<ui:include src="/WEB-INF/templates/admin/landline/admin_landline_data.tpl">
+						<ui:include src="/WEB-INF/templates/admin/fax/admin_fax_data.tpl">
 							<ui:param name="isShowPage" value="#{false}" />
 							<ui:param name="showAdminLinks" value="#{false}" />
 						</ui:include>
@@ -37,7 +37,7 @@
 					</div>
 
 					<div class="table_footer">
-						<h:commandButton styleClass="delete_button" type="submit" id="delete_landline" value="#{msg.BUTTON_ADMIN_DELETE_FAX}" action="#{adminPhoneController.deleteMobileData()}" />
+						<h:commandButton styleClass="delete_button" type="submit" id="delete_fax" value="#{msg.BUTTON_ADMIN_DELETE_FAX}" action="#{adminPhoneController.deleteMobileData()}" />
 					</div>
 				</h:panelGroup>
 			</h:form>
diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml
index 296641bb..942c61bc 100644
--- a/web/admin/fax/admin_fax_edit.xhtml
+++ b/web/admin/fax/admin_fax_edit.xhtml
@@ -20,7 +20,7 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<h:form id="form_edit_landline" rendered="#{not empty beanHelper.faxNumber}">
+			<h:form id="form_edit_fax" rendered="#{not empty beanHelper.faxNumber}">
 				<h:panelGroup styleClass="table_medium" layout="block">
 					<div class="table_header">
 						<h:outputFormat value="#{msg.ADMIN_EDIT_FAX_NUMBER_TITLE}">
@@ -32,7 +32,7 @@
 
 					<div class="table_footer">
 						<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-						<h:commandButton styleClass="submit" type="submit" id="edit_landline" value="#{msg.BUTTON_ADMIN_EDIT_FAX_NUMBER}" action="#{adminPhoneController.editMobileData()}" />
+						<h:commandButton styleClass="submit" type="submit" id="edit_fax" value="#{msg.BUTTON_ADMIN_EDIT_FAX_NUMBER}" action="#{adminPhoneController.editMobileData()}" />
 					</div>
 				</h:panelGroup>
 			</h:form>
diff --git a/web/admin/fax/admin_fax_list.xhtml b/web/admin/fax/admin_fax_list.xhtml
index b306cf0c..c8bd8941 100644
--- a/web/admin/fax/admin_fax_list.xhtml
+++ b/web/admin/fax/admin_fax_list.xhtml
@@ -15,13 +15,13 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<h:dataTable id="table_list_landlines" var="faxNumber" value="#{phoneController.allFaxNumbers()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_FAXS}" rendered="#{not phoneController.allFaxNumbers().isEmpty()}">
+			<h:dataTable id="table_list_fax" var="faxNumber" value="#{phoneController.allFaxNumbers()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_FAXS}" rendered="#{not phoneController.allFaxNumbers().isEmpty()}">
 				<h:column>
 					<f:facet name="header">
 						<h:outputText value="#{msg.ADMIN_SHOW_PHONE_ID}" />
 					</f:facet>
 
-					<h:link outcome="admin_show_landline">
+					<h:link outcome="admin_show_fax">
 						<h:outputText value="#{faxNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}" />
 						<f:param name="phoneId" value="#{faxNumber.phoneId}" />
 					</h:link>
diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml
index f610b2db..9a02c0d7 100644
--- a/web/admin/fax/admin_fax_show.xhtml
+++ b/web/admin/fax/admin_fax_show.xhtml
@@ -19,11 +19,11 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<ui:include src="/WEB-INF/templates/admin/landline/admin_landline_data.tpl">
+			<ui:include src="/WEB-INF/templates/admin/fax/admin_fax_data.tpl">
 				<ui:param name="isShowPage" value="#{true}" />
 			</ui:include>
 
-			<h:dataTable id="contact_landline_link" var="contact" value="#{contactPhoneController.allFaxNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
+			<h:dataTable id="contact_fax_link" var="contact" value="#{contactPhoneController.allFaxNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
 				<f:facet name="header">
 					<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_FAX_LINKS}">
 						<f:param value="#{beanHelper.faxNumber.phoneId}" />
@@ -77,7 +77,7 @@
 					<div class="table_data_field">
 						<ul class="mini_nav">
 							<li class="mini_link">
-								<h:link outcome="admin_unlink_contact_landline">
+								<h:link outcome="admin_unlink_contact_fax">
 									<h:outputText styleClass="unlink_link" 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="#{contact.contactId}" />
diff --git a/web/admin/landline/admin_landline_list.xhtml b/web/admin/landline/admin_landline_list.xhtml
index bcaed2e1..82b000d2 100644
--- a/web/admin/landline/admin_landline_list.xhtml
+++ b/web/admin/landline/admin_landline_list.xhtml
@@ -15,7 +15,7 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<h:dataTable id="table_list_landlines" var="landLineNumber" value="#{phoneController.allLandLineNumbers()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_LAND_LINES}" rendered="#{not phoneController.allLandLineNumbers().isEmpty()}">
+			<h:dataTable id="table_list_landline" var="landLineNumber" value="#{phoneController.allLandLineNumbers()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_LAND_LINES}" rendered="#{not phoneController.allLandLineNumbers().isEmpty()}">
 				<h:column>
 					<f:facet name="header">
 						<h:outputText value="#{msg.ADMIN_SHOW_PHONE_ID}" />
diff --git a/web/admin/mobile/admin_mobile_list.xhtml b/web/admin/mobile/admin_mobile_list.xhtml
index 0284acf1..4e77b5ec 100644
--- a/web/admin/mobile/admin_mobile_list.xhtml
+++ b/web/admin/mobile/admin_mobile_list.xhtml
@@ -15,7 +15,7 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<h:dataTable id="table_list_mobiles" var="mobile" value="#{phoneController.allMobileNumbers()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILES}" rendered="#{not phoneController.allMobileNumbers().isEmpty()}">
+			<h:dataTable id="table_list_mobile" var="mobile" value="#{phoneController.allMobileNumbers()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILES}" rendered="#{not phoneController.allMobileNumbers().isEmpty()}">
 				<h:column>
 					<f:facet name="header">
 						<h:outputText value="#{msg.ADMIN_SHOW_PHONE_ID}" />