From b100a82baddc312f0deb6a8b3129572117acd6b3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sat, 5 Aug 2017 15:39:42 +0200
Subject: [PATCH] Please cherry-pick: - renamed copySomeFooToController() to
notifyControllerSomeFooConverted() as this reflects more what it now does -
added missing notify calls (see above) - added missing onPostback attribute
---
web/admin/contact/admin_contact_edit.xhtml | 2 +-
web/admin/contact/admin_contact_show.xhtml | 2 +-
web/admin/contact/unlink/admin_contact_fax_unlink.xhtml | 8 +++++---
web/admin/fax/admin_fax_delete.xhtml | 2 +-
web/admin/fax/admin_fax_edit.xhtml | 2 +-
web/admin/fax/admin_fax_show.xhtml | 2 +-
web/admin/landline/admin_landline_delete.xhtml | 2 +-
web/admin/landline/admin_landline_edit.xhtml | 2 +-
web/admin/landline/admin_landline_show.xhtml | 2 +-
web/admin/mobile/admin_mobile_delete.xhtml | 2 +-
web/admin/mobile/admin_mobile_edit.xhtml | 2 +-
web/admin/mobile/admin_mobile_show.xhtml | 2 +-
web/admin/user/admin_user_activity_log.xhtml | 2 +-
web/admin/user/admin_user_delete.xhtml | 2 +-
web/admin/user/admin_user_edit.xhtml | 2 +-
web/admin/user/admin_user_list.xhtml | 2 +-
web/admin/user/admin_user_lock.xhtml | 2 +-
web/admin/user/admin_user_resend_confirmation_link.xhtml | 2 +-
web/admin/user/admin_user_show.xhtml | 2 +-
web/admin/user/admin_user_unlock.xhtml | 2 +-
web/guest/user/user_profile.xhtml | 2 +-
21 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml
index c6a17122..8ae087e9 100644
--- a/web/admin/contact/admin_contact_edit.xhtml
+++ b/web/admin/contact/admin_contact_edit.xhtml
@@ -8,7 +8,7 @@
<ui:define name="metadata">
<f:metadata>
<f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
- <f:viewAction action="#{beanHelper.copyContactToController()}" />
+ <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerContactConverted()}" />
</f:metadata>
</ui:define>
diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml
index 72b85615..5820d498 100644
--- a/web/admin/contact/admin_contact_show.xhtml
+++ b/web/admin/contact/admin_contact_show.xhtml
@@ -8,7 +8,7 @@
<ui:define name="metadata">
<f:metadata>
<f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
- <f:viewAction onPostback="true" action="#{beanHelper.copyContactToController()}" />
+ <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerContactConverted()}" />
</f:metadata>
</ui:define>
diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
index a196acfd..e9d23a02 100644
--- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
@@ -9,6 +9,8 @@
<f:metadata>
<f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
<f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+ <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerContactConverted()}" />
+ <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
</f:metadata>
</ui:define>
@@ -33,7 +35,7 @@
<div class="para">
<h:link outcome="admin_show_contact" value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}">
- <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
+ <f:param name="contactId" value="#{adminContactPhoneController.contact.contactId}" />
</h:link>
</div>
@@ -65,8 +67,8 @@
</ui:fragment>
<h:outputFormat styleClass="errors" value="#{msg.ERROR_FAX_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber != beanHelper.faxNumber}">
- <f:param value="#{beanHelper.faxNumber.phoneId}" />
- <f:param value="#{beanHelper.contact.contactId}" />
+ <f:param value="#{adminContactPhoneController.phoneId}" />
+ <f:param value="#{adminContactPhoneController.contact.contactId}" />
</h:outputFormat>
</ui:define>
</ui:composition>
diff --git a/web/admin/fax/admin_fax_delete.xhtml b/web/admin/fax/admin_fax_delete.xhtml
index f34fbfaf..8477adb9 100644
--- a/web/admin/fax/admin_fax_delete.xhtml
+++ b/web/admin/fax/admin_fax_delete.xhtml
@@ -8,7 +8,7 @@
<ui:define name="metadata">
<f:metadata>
<f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
- <f:viewAction onPostback="true" action="#{beanHelper.copyFaxNumberToController()}" />
+ <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
</f:metadata>
</ui:define>
diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml
index b6f72225..14acb2f1 100644
--- a/web/admin/fax/admin_fax_edit.xhtml
+++ b/web/admin/fax/admin_fax_edit.xhtml
@@ -8,7 +8,7 @@
<ui:define name="metadata">
<f:metadata>
<f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
- <f:viewAction action="#{beanHelper.copyFaxNumberToController()}" />
+ <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
</f:metadata>
</ui:define>
diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml
index 376c04b9..4dccd2f3 100644
--- a/web/admin/fax/admin_fax_show.xhtml
+++ b/web/admin/fax/admin_fax_show.xhtml
@@ -8,7 +8,7 @@
<ui:define name="metadata">
<f:metadata>
<f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
- <f:viewAction onPostback="true" action="#{beanHelper.copyFaxNumberToController()}" />
+ <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
</f:metadata>
</ui:define>
diff --git a/web/admin/landline/admin_landline_delete.xhtml b/web/admin/landline/admin_landline_delete.xhtml
index 16cd0726..9c9894c0 100644
--- a/web/admin/landline/admin_landline_delete.xhtml
+++ b/web/admin/landline/admin_landline_delete.xhtml
@@ -8,7 +8,7 @@
<ui:define name="metadata">
<f:metadata>
<f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
- <f:viewAction action="#{beanHelper.copyLandLineNumberToController()}" />
+ <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
</f:metadata>
</ui:define>
diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml
index 17e9529d..d4f0a1e7 100644
--- a/web/admin/landline/admin_landline_edit.xhtml
+++ b/web/admin/landline/admin_landline_edit.xhtml
@@ -8,7 +8,7 @@
<ui:define name="metadata">
<f:metadata>
<f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
- <f:viewAction action="#{beanHelper.copyLandLineNumberToController()}" />
+ <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
</f:metadata>
</ui:define>
diff --git a/web/admin/landline/admin_landline_show.xhtml b/web/admin/landline/admin_landline_show.xhtml
index ee7fe755..96a05af0 100644
--- a/web/admin/landline/admin_landline_show.xhtml
+++ b/web/admin/landline/admin_landline_show.xhtml
@@ -2,7 +2,7 @@
<ui:define name="metadata">
<f:metadata>
<f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
- <f:viewAction action="#{beanHelper.copyLandLineNumberToController()}" />
+ <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
</f:metadata>
</ui:define>
diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml
index 3c8b2d14..eae1af98 100644
--- a/web/admin/mobile/admin_mobile_delete.xhtml
+++ b/web/admin/mobile/admin_mobile_delete.xhtml
@@ -8,7 +8,7 @@
<ui:define name="metadata">
<f:metadata>
<f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
- <f:viewAction action="#{beanHelper.copyMobileNumberToController()}" />
+ <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerMobileNumberConverted()}" />
</f:metadata>
</ui:define>
diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml
index fef08d86..e067086f 100644
--- a/web/admin/mobile/admin_mobile_edit.xhtml
+++ b/web/admin/mobile/admin_mobile_edit.xhtml
@@ -8,7 +8,7 @@
<ui:define name="metadata">
<f:metadata>
<f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
- <f:viewAction action="#{beanHelper.copyMobileNumberToController()}" />
+ <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerMobileNumberConverted()}" />
</f:metadata>
</ui:define>
diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml
index f4119d9d..6c050819 100644
--- a/web/admin/mobile/admin_mobile_show.xhtml
+++ b/web/admin/mobile/admin_mobile_show.xhtml
@@ -8,7 +8,7 @@
<ui:define name="metadata">
<f:metadata>
<f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
- <f:viewAction action="#{beanHelper.copyMobileNumberToController()}" />
+ <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerMobileNumberConverted()}" />
</f:metadata>
</ui:define>
diff --git a/web/admin/user/admin_user_activity_log.xhtml b/web/admin/user/admin_user_activity_log.xhtml
index d46cc093..686c0e7d 100644
--- a/web/admin/user/admin_user_activity_log.xhtml
+++ b/web/admin/user/admin_user_activity_log.xhtml
@@ -8,7 +8,7 @@
<ui:define name="metadata">
<f:metadata>
<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
- <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+ <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
</f:metadata>
</ui:define>
diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml
index e1aec671..f988b3ec 100644
--- a/web/admin/user/admin_user_delete.xhtml
+++ b/web/admin/user/admin_user_delete.xhtml
@@ -8,7 +8,7 @@
<ui:define name="metadata">
<f:metadata>
<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
- <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+ <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
</f:metadata>
</ui:define>
diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml
index 0c4ca701..fef405b5 100644
--- a/web/admin/user/admin_user_edit.xhtml
+++ b/web/admin/user/admin_user_edit.xhtml
@@ -8,7 +8,7 @@
<ui:define name="metadata">
<f:metadata>
<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
- <f:viewAction action="#{beanHelper.copyUserToController()}" />
+ <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
</f:metadata>
</ui:define>
diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index 43f73d76..14a7b0a9 100644
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -112,7 +112,7 @@
</div>
<div class="table_right_medium">
- <h:selectOneMenu styleClass="select" id="userContact" value="#{beanHelper.contact}" converter="ContactConverter">
+ <h:selectOneMenu styleClass="select" id="userContact" value="#{adminUserController.contact}" converter="ContactConverter">
<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
<f:selectItems value="#{contactController.selectableContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{contact.contactId}: #{msg[contact.contactPersonalTitle.messageKey]} #{contact.contactFirstName} #{contact.contactFamilyName}" />
</h:selectOneMenu>
diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml
index c2b01b3e..c88cb2be 100644
--- a/web/admin/user/admin_user_lock.xhtml
+++ b/web/admin/user/admin_user_lock.xhtml
@@ -8,7 +8,7 @@
<ui:define name="metadata">
<f:metadata>
<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
- <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+ <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
</f:metadata>
</ui:define>
diff --git a/web/admin/user/admin_user_resend_confirmation_link.xhtml b/web/admin/user/admin_user_resend_confirmation_link.xhtml
index 3c79bdeb..dba93f62 100644
--- a/web/admin/user/admin_user_resend_confirmation_link.xhtml
+++ b/web/admin/user/admin_user_resend_confirmation_link.xhtml
@@ -8,7 +8,7 @@
<ui:define name="metadata">
<f:metadata>
<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
- <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+ <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
</f:metadata>
</ui:define>
diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
index 03145215..993374a9 100644
--- a/web/admin/user/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -8,7 +8,7 @@
<ui:define name="metadata">
<f:metadata>
<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
- <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+ <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
</f:metadata>
</ui:define>
diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index 288b64d8..d98c0368 100644
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -8,7 +8,7 @@
<ui:define name="metadata">
<f:metadata>
<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
- <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+ <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
</f:metadata>
</ui:define>
diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml
index 61032ce3..200bf166 100644
--- a/web/guest/user/user_profile.xhtml
+++ b/web/guest/user/user_profile.xhtml
@@ -8,7 +8,7 @@
<ui:define name="metadata">
<f:metadata>
<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
- <f:viewAction action="#{beanHelper.copyUserToController()}" />
+ <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
</f:metadata>
</ui:define>
--
2.39.5