Please cherry-pick:

[jjobs-war.git] / web / admin / landline / admin_landline_delete.xhtml

diff --git a/web/admin/landline/admin_landline_delete.xhtml b/web/admin/landline/admin_landline_delete.xhtml
index f04185a98563e6271f693c201cc5bda2a7dafb0e..486ff2d7e97bec437feb0c99224401fdc56a76c0 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>
 
@@ -39,13 +39,13 @@
                                </div>
 
                                <div class="table_footer">
-                                       <h:commandButton styleClass="delete_button" type="submit" id="delete_landline" value="#{msg.BUTTON_ADMIN_DELETE_LAND_LINE}" action="#{adminPhoneController.deleteLandLineData(beanHelper.landLineNumber)}" />
+                                       <h:commandButton styleClass="delete_button" type="submit" id="delete_landline" value="#{msg.BUTTON_ADMIN_DELETE_LAND_LINE}" action="#{adminPhoneController.deleteLandLineData()}" />
                                </div>
                        </h:panelGroup>
                </h:form>
 
                <ui:fragment rendered="#{empty beanHelper.landLineNumber}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
                                <ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" />
                                <ui:param name="styleClass" value="errors" />
                        </ui:include>