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

diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml
index c6a1712245f96b26aebb647edff482c91c6109b7..8ae087e9f70cb74d233fb85ea7692920d60f28e3 100644 (file)
--- 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 72b85615b4887d9f357b967830a2cf8893e1743a..5820d498af143d07d5d4d2106e6887d238085928 100644 (file)
--- 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 a196acfd95d92be24d3dde45df62aaf5b6d03c5a..e9d23a02a19f4aa7fd511ab40be439aeb18ab964 100644 (file)
--- 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 f34fbfafdda7f85be4cca114238165c0fbe858c6..8477adb9aadabf49c55605a89ab5f43599825e6e 100644 (file)
--- 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 b6f722256c647f7a5a52264424489265ab584115..14acb2f192056e57aa83fcfa3c1b2e594ed2390c 100644 (file)
--- 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 376c04b9733996d5089e90eb6078f21812abd00a..4dccd2f304c857a329b9c812bae427d424f8d79d 100644 (file)
--- 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 16cd072636adaf7cac57aab806cea9f7ac8c7327..9c9894c0768be23dc2a9d5b6478fc79aac1540bf 100644 (file)
--- 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 17e9529dc3ca42332e4ec338bc5fbc0351826e26..d4f0a1e76ede74e01ac3e98bd7499a0faa28d185 100644 (file)
--- 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 ee7fe755be0b721e702cebaf9cf46e822891ebb6..96a05af0acf1fd768c2ef55ef7ece95be88e196b 100644 (file)
--- 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 3c8b2d14f4ccbcc6fbfd15f2e418e158cd695d20..eae1af988e24f18e59a8ad8028cdc9532dd905cf 100644 (file)
--- 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 fef08d8671fdcc487016da21e48897e3773cdd2f..e067086f6c57f853b1fff3678f451b550c618c45 100644 (file)
--- 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 f4119d9d61a98d340c9390a11ee078d81320540b..6c050819a9572ac27eab2345c2d9d2d5c530d935 100644 (file)
--- 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 d46cc09351cc21c65350452af1efc9aaaa3bf69d..686c0e7d9217b78fbf9f26aac883607905a4bb4e 100644 (file)
--- 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 e1aec671f0368b3306ac3950678fa92c20642531..f988b3ec032fb3acabaaedf138e29913b8d35b6c 100644 (file)
--- 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 0c4ca70120c262bbec7362ad9f681421381a9497..fef405b537f46ebe556f66f1e6a9f8d671f96b82 100644 (file)
--- 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 43f73d7637ef23551b43dbb894802ad2ee407dd2..14a7b0a985a907a85cf7232d2d614ca5f8898d05 100644 (file)
--- 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 c2b01b3eaac3e7f13246ecd2205e5c5ca1972538..c88cb2be59bd058956b13533b10ad14f6a2059bf 100644 (file)
--- 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 3c79bdeb805c1866c061fe92b8ba0b8e9106527e..dba93f626ee335cec8b12a1eacb99b880f0fd6f6 100644 (file)
--- 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 03145215f6d12afdf10091609734b66b1444dce8..993374a9a6834a7112c96f3d1d895232facb2b5f 100644 (file)
--- 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 288b64d82023ecb56f215119be2de942e550a4f7..d98c03687173d115f35975e40bbe2f4c3a5faf97 100644 (file)
--- 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 61032ce3dc55d84be3b0ed79d17642e9bc49e4d1..200bf166a0b3dca5086e11df48f58d6c2dfd93ae 100644 (file)
--- 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>