Please cherry-pick (Massive rewrite):

[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 67f398ee2c4ab5e764fb0fe340430c4af08a1ed9..2fe57c42d0481104a3e58fa7fbe936bda3c3b6b1 100644 (file)
--- a/web/admin/landline/admin_landline_delete.xhtml
+++ b/web/admin/landline/admin_landline_delete.xhtml
@@ -10,14 +10,17 @@
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <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: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:metadata>
                </ui:define>
 
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_LAND_LINE}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_LAND_LINE}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_DELETE_LAND_LINE}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_LAND_LINE}" />
                </ui:define>
 
                <ui:define name="content">
@@ -39,12 +42,17 @@
                                        </div>
 
                                        <div class="table_footer">
-                                               <h:commandButton styleClass="delete_button" type="submit" id="delete_landline" value="#{msg.BUTTON_ADMIN_DELETE_LAND_LINE}" action="#{adminPhoneController.deleteMobileData()}" />
+                                               <h:commandButton styleClass="delete_button" type="submit" id="delete_landline" value="#{msg.BUTTON_ADMIN_DELETE_LAND_LINE}" action="#{adminPhoneController.deleteLandLineData(beanHelper.landLineNumber)}" />
                                        </div>
                                </h:panelGroup>
                        </h:form>
 
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.landLineNumber}" />
+                       <ui:fragment rendered="#{empty beanHelper.landLineNumber}">
+                               <ui:include src="/WEB-INF/templates/generic/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>
+                       </ui:fragment>
                </ui:define>
        </ui:composition>
 </html>