Updated copyright year

[jjobs-war.git] / web / admin / contact / unlink / admin_contact_mobile_unlink.xhtml

diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
index aa699eb71d94f5662fb53667aa11e1f46dd6add6..2bde48f875de32ee21942892c0b3c3e70eb4e271 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
@@ -11,8 +11,22 @@
 
        <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: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:viewParam
+                               name="mobileId"
+                               value="#{beanHelper.mobileNumber}"
+                               converter="MobileNumberConverter"
+                               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:metadata>
        </ui:define>
 
@@ -25,10 +39,6 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox panelGroupId="errorHandlerUnlinkMobile" message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
-
-               <core:outputMessageBox panelGroupId="errorHandlerUnlinkContact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
-
                <h:form rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber == beanHelper.mobileNumber}">
                        <h:panelGroup styleClass="table" layout="block">
                                <div class="table-header">
@@ -50,19 +60,28 @@
                                </div>
 
                                <div class="para">
-                                       <core:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.mobileNumber}" contact="#{beanHelper.contact}" renderShowLink="false" showAdminDropdownMenu="false" />
+                                       <core:outputAdminMobilePanelGrid
+                                               mobileNumber="#{beanHelper.mobileNumber}"
+                                               contact="#{beanHelper.contact}"
+                                               renderShowLink="false"
+                                               showAdminDropdownMenu="false"
+                                               />
                                </div>
 
                                <p:commandButton
                                        type="submit"
                                        value="#{msg.BUTTON_ADMIN_UNLINK_MOBILE_NUMBER}"
-                                       action="#{adminContactPhoneController.unlinkMobileContactData()}"
+                                       action="#{adminContactMobileController.unlinkMobileContactData()}"
                                        />
                        </h:panelGroup>
                </h:form>
 
-               <h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_MOBILE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.mobileNumber}">
-                       <f:param value="#{beanHelper.mobileNumber.phoneId}" />
+               <h:outputFormat
+                       styleClass="alert-danger"
+                       value="#{msg.ERROR_MOBILE_NUMBER_CONTACT_NOT_LINKED}"
+                       rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.mobileNumber}"
+                       >
+                       <f:param value="#{beanHelper.mobileNumber.mobileId}" />
                        <f:param value="#{beanHelper.contact.contactId}" />
                </h:outputFormat>
        </ui:define>