LUT-30312 : fix various issues

src/java/fr/paris/lutece/plugins/forms/business/FormMessage.java

@@ -50,6 +50,8 @@ public class FormMessage
     @Size( max = 3000, message = "#i18n{forms.validation.form.EndMessage.size}" )
     private String _strEndMessage;
 
+    private String _strLabelEndMessageButton;
+
     /**
      * @return the _nId
      */
@@ -118,4 +120,21 @@ public void setEndMessage( String strEndMessage )
         this._strEndMessage = strEndMessage;
     }
 
+    /**
+     * @return the _strLabelEndMessageButton
+     */
+    public String getLabelEndMessageButton( )
+    {
+        return _strLabelEndMessageButton;
+    }
+
+    /**
+     * @param strLabelEndMessageButton
+     *            the strLabelEndMessageButton to set
+     */
+    public void setLabelEndMessageButton( String strLabelEndMessageButton )
+    {
+        this._strLabelEndMessageButton = strLabelEndMessageButton;
+    }
+
 }

src/java/fr/paris/lutece/plugins/forms/business/FormMessageDAO.java

@@ -46,13 +46,13 @@
 public final class FormMessageDAO implements IFormMessageDAO
 {
     // Constants
-    private static final String SQL_QUERY_SELECTALL = "SELECT id, id_form, end_message_display, end_message FROM forms_message";
+    private static final String SQL_QUERY_SELECTALL = "SELECT id, id_form, end_message_display, end_message, label_end_message_button FROM forms_message";
     private static final String SQL_QUERY_SELECT = SQL_QUERY_SELECTALL + " WHERE id = ?";
     private static final String SQL_QUERY_SELECT_BY_FORM = SQL_QUERY_SELECTALL + " WHERE id_form = ?";
-    private static final String SQL_QUERY_INSERT = "INSERT INTO forms_message ( id_form, end_message_display, end_message ) VALUES ( ?, ?, ? ) ";
+    private static final String SQL_QUERY_INSERT = "INSERT INTO forms_message ( id_form, end_message_display, end_message, label_end_message_button ) VALUES ( ?, ?, ?, ? ) ";
     private static final String SQL_QUERY_DELETE = "DELETE FROM forms_message WHERE id = ? ";
     private static final String SQL_QUERY_DELETE_BY_FORM = "DELETE FROM forms_message WHERE id_form = ? ";
-    private static final String SQL_QUERY_UPDATE = "UPDATE forms_message SET id_form = ?, end_message_display = ?, end_message = ? WHERE id = ?";
+    private static final String SQL_QUERY_UPDATE = "UPDATE forms_message SET id_form = ?, end_message_display = ?, end_message = ?, label_end_message_button = ? WHERE id = ?";
 
     /**
      * {@inheritDoc }
@@ -66,6 +66,7 @@ public void insert( FormMessage formMessage, Plugin plugin )
             daoUtil.setInt( nIndex++, formMessage.getIdForm( ) );
             daoUtil.setBoolean( nIndex++, formMessage.getEndMessageDisplay( ) );
             daoUtil.setString( nIndex++, formMessage.getEndMessage( ) );
+            daoUtil.setString( nIndex++, formMessage.getLabelEndMessageButton( ) );
 
             daoUtil.executeUpdate( );
 
@@ -135,6 +136,7 @@ public void store( FormMessage formMessage, Plugin plugin )
             daoUtil.setInt( nIndex++, formMessage.getIdForm( ) );
             daoUtil.setBoolean( nIndex++, formMessage.getEndMessageDisplay( ) );
             daoUtil.setString( nIndex++, formMessage.getEndMessage( ) );
+            daoUtil.setString( nIndex++, formMessage.getLabelEndMessageButton( ) );
 
             daoUtil.setInt( nIndex++, formMessage.getId( ) );
 
@@ -177,6 +179,7 @@ private FormMessage dataToObject( DAOUtil daoUtil )
         formMessage.setIdForm( daoUtil.getInt( "id_form" ) );
         formMessage.setEndMessageDisplay( daoUtil.getBoolean( "end_message_display" ) );
         formMessage.setEndMessage( daoUtil.getString( "end_message" ) );
+        formMessage.setLabelEndMessageButton( daoUtil.getString( "label_end_message_button" ) );
 
         return formMessage;
     }

src/java/fr/paris/lutece/plugins/forms/business/form/panel/FormPanelFactory.java

@@ -33,6 +33,7 @@
  */
 package fr.paris.lutece.plugins.forms.business.form.panel;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -102,10 +103,10 @@ public FormPanel buildFormPanel( IFormPanelConfiguration formPanelConfiguration
             try
             {
                 formPanelInitializerClass = Class.forName( strInitializerName ).asSubclass( IFormPanelInitializer.class );
-                IFormPanelInitializer formPanelInitializer = formPanelInitializerClass.newInstance( );
+                IFormPanelInitializer formPanelInitializer = formPanelInitializerClass.getDeclaredConstructor().newInstance( );
                 formPanel.getListFormPanelInitializer( ).add( formPanelInitializer );
             }
-            catch( ClassNotFoundException | InstantiationException | IllegalAccessException e )
+            catch( ClassNotFoundException | InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e )
             {
                 AppLogService.error( e );
             }

src/java/fr/paris/lutece/plugins/forms/resources/forms_messages.properties

@@ -42,9 +42,9 @@ action.name.name=Delete the form
 action.viewResponses.name=View responses
 module.forms.documentproducer.actions.extractpdf.name=PDF configuration
 
-action.modify.name=Modify form parameters
+action.params.name=Modify form parameters
 action.delete.name=Delete the form
-action.params.name=Edit form steps
+action.modify.name=Edit form steps
 action.publish.name=Edit form publication
 module.forms.documentproducer.actions.extractpdf.description=Manage PDF configuration for form responses
 
@@ -203,6 +203,7 @@ create_form.labelDisplaySummary.help=Enables a summary page before final saving
 create_form.labelEndMessageDisplay=End message display
 create_form.labelEndMessageDisplay.help=The end message will be displayed to the user if this box is checked
 create_form.labelEndMessage=End message
+create_form.labelLabelEndMessageButton=Label of the end message button
 create_form.labelEndMessage.help=This message will be displayed to the user when submitting the form
 create_form.labelReturnUrl=Return URL
 create_form.labelReturnUrl.help=URL called after form submission. If empty and authentication is required, redirect to response detail, otherwise, return to the first step
@@ -275,6 +276,7 @@ modify_form.labelDisplaySummary.help=Enables a summary page before final saving
 modify_form.labelEndMessageDisplay=End message display
 modify_form.labelEndMessageDisplay.help=The end message will be displayed to the user if this box is checked
 modify_form.labelEndMessage=End message
+modify_form.labelLabelEndMessageButton=Label of the end message button
 modify_form.labelEndMessage.help=This message will be displayed to the user when submitting the form
 modify_form.labelReturnUrl=Return URL
 modify_form.labelReturnUrl.help=URL called after form submission. If empty and authentication is required, redirect to response detail, otherwise, return to the first step

src/java/fr/paris/lutece/plugins/forms/resources/forms_messages_ar.properties

@@ -42,9 +42,9 @@ action.name.name=\u062d\u0630\u0641 \u0627\u0644\u0646\u0645\u0648\u0630\u062c
 action.viewResponses.name=\u0639\u0631\u0636 \u0627\u0644\u0631\u062f\u0648\u062f
 module.forms.documentproducer.actions.extractpdf.name=\u062a\u0643\u0648\u064a\u0646 PDF
 
-action.modify.name=\u062a\u0639\u062f\u064a\u0644 \u0645\u0639\u0644\u0645\u0627\u062a \u0627\u0644\u0646\u0645\u0648\u0630\u062c
+action.params.name=\u062a\u0639\u062f\u064a\u0644 \u0645\u0639\u0644\u0645\u0627\u062a \u0627\u0644\u0646\u0645\u0648\u0630\u062c
 action.delete.name=\u062d\u0630\u0641 \u0627\u0644\u0646\u0645\u0648\u0630\u062c
-action.params.name=\u062a\u062d\u0631\u064a\u0631 \u062e\u0637\u0648\u0627\u062a \u0627\u0644\u0646\u0645\u0648\u0630\u062c
+action.modify.name=\u062a\u062d\u0631\u064a\u0631 \u062e\u0637\u0648\u0627\u062a \u0627\u0644\u0646\u0645\u0648\u0630\u062c
 action.publish.name=\u062a\u062d\u0631\u064a\u0631 \u0646\u0634\u0631 \u0627\u0644\u0646\u0645\u0648\u0630\u062c
 module.forms.documentproducer.actions.extractpdf.description=\u0625\u062f\u0627\u0631\u0629 \u062a\u0643\u0648\u064a\u0646 PDF \u0644\u0631\u062f\u0648\u062f \u0627\u0644\u0646\u0645\u0648\u0630\u062c
 

src/java/fr/paris/lutece/plugins/forms/resources/forms_messages_cz.properties

@@ -42,9 +42,9 @@ action.name.name=Smazat formul\u00e1\u0159
 action.viewResponses.name=Zobrazit odpov\u011bdi
 module.forms.documentproducer.actions.extractpdf.name=Konfigurace PDF
 
-action.modify.name=Upravit parametry formul\u00e1\u0159e
+action.params.name=Upravit parametry formul\u00e1\u0159e
 action.delete.name=Smazat formul\u00e1\u0159
-action.params.name=Upravit kroky formul\u00e1\u0159e
+action.modify.name=Upravit kroky formul\u00e1\u0159e
 action.publish.name=Upravit publikaci formul\u00e1\u0159e
 module.forms.documentproducer.actions.extractpdf.description=Spravovat konfiguraci PDF odpov\u011bd\u00ed na formul\u00e1\u0159
 

src/java/fr/paris/lutece/plugins/forms/resources/forms_messages_de.properties

@@ -42,9 +42,9 @@ action.name.name=Formular l\u00f6schen
 action.viewResponses.name=Antworten anzeigen
 module.forms.documentproducer.actions.extractpdf.name=PDF-Konfiguration
 
-action.modify.name=Formularparameter bearbeiten
+action.params.name=Formularparameter bearbeiten
 action.delete.name=Formular l\u00f6schen
-action.params.name=Formularschritte bearbeiten
+action.modify.name=Formularschritte bearbeiten
 action.publish.name=Formularver\u00f6ffentlichung bearbeiten
 module.forms.documentproducer.actions.extractpdf.description=Konfiguration des PDF der Antworten auf das Formular verwalten
 

src/java/fr/paris/lutece/plugins/forms/resources/forms_messages_dk.properties

@@ -42,9 +42,9 @@ action.name.name=Slet formular
 action.viewResponses.name=Se svar
 module.forms.documentproducer.actions.extractpdf.name=Konfiguration af PDF
 
-action.modify.name=Rediger formularparametre
+action.params.name=Rediger formularparametre
 action.delete.name=Slet formular
-action.params.name=Rediger formulartrin
+action.modify.name=Rediger formulartrin
 action.publish.name=Rediger formularoffentligg\u00f8relse
 module.forms.documentproducer.actions.extractpdf.description=H\u00e5ndter konfiguration af PDF for formularsvar
 

src/java/fr/paris/lutece/plugins/forms/resources/forms_messages_es.properties

@@ -42,9 +42,9 @@ action.name.name=Eliminar el formulario
 action.viewResponses.name=Ver respuestas
 module.forms.documentproducer.actions.extractpdf.name=Configuraci\u00f3n del PDF
 
-action.modify.name=Modificar par\u00e1metros del formulario
+action.params.name=Modificar par\u00e1metros del formulario
 action.delete.name=Eliminar el formulario
-action.params.name=Editar pasos del formulario
+action.modify.name=Editar pasos del formulario
 action.publish.name=Editar la publicaci\u00f3n del formulario
 module.forms.documentproducer.actions.extractpdf.description=Gestionar la configuraci\u00f3n del PDF de las respuestas al formulario
 

src/java/fr/paris/lutece/plugins/forms/resources/forms_messages_fi.properties

@@ -42,9 +42,9 @@ action.name.name=Poista lomake
 action.viewResponses.name=N\u00e4yt\u00e4 vastaukset
 module.forms.documentproducer.actions.extractpdf.name=PDF:n asetukset
 
-action.modify.name=Muokkaa lomakkeen asetuksia
+action.params.name=Muokkaa lomakkeen asetuksia
 action.delete.name=Poista lomake
-action.params.name=Muokkaa lomakkeen vaiheita
+action.modify.name=Muokkaa lomakkeen vaiheita
 action.publish.name=Muokkaa lomakkeen julkaisua
 module.forms.documentproducer.actions.extractpdf.description=Hallitse lomakkeen vastausten PDF-asetuksia
 

src/java/fr/paris/lutece/plugins/forms/resources/forms_messages_fr.properties

@@ -42,9 +42,9 @@ action.name.name=Supprimer le formulaire
 action.viewResponses.name=Voir les r\u00e9ponses
 module.forms.documentproducer.actions.extractpdf.name=Configuration du PDF
 
-action.modify.name=Modifier les param\u00e8tres du formulaire
+action.params.name=Modifier les param\u00e8tres du formulaire
 action.delete.name=Supprimer le formulaire
-action.params.name=Editer les \u00e9tapes du formulaire
+action.modify.name=Editer les \u00e9tapes du formulaire
 action.publish.name=Editer la publication du formulaire
 module.forms.documentproducer.actions.extractpdf.description=G\u00e9rer la configuration du PDF des r\u00e9ponses au formualaire
 
@@ -203,6 +203,7 @@ create_form.labelDisplaySummary.help=Active une page de r\u00e9capitulatif avant
 create_form.labelEndMessageDisplay=Affichage du message de fin
 create_form.labelEndMessageDisplay.help=Le message de fin sera affich\u00e9 \u00e0 l'usager si cette case est coch\u00e9e
 create_form.labelEndMessage=Message de fin
+create_form.labelLabelEndMessageButton=Libell\u00e9 du bouton du message de fin
 create_form.labelEndMessage.help=Ce message sera affich\u00e9 \u00e0 l'usager lors de la soumission du formulaire
 create_form.labelReturnUrl=URL de retour
 create_form.labelReturnUrl.help=URL appel\u00e9e apr\u00e8s la soumission d'un formulaire. Si vide et l'authentification est requise, redirection vers le d\u00e9tail de la r\u00e9ponse sinon, retour \u00e0 la premi\u00e8re \u00e9tape 
@@ -275,6 +276,7 @@ modify_form.labelDisplaySummary.help=Active une page de r\u00e9capitulatif avant
 modify_form.labelEndMessageDisplay=Affichage du message de fin
 modify_form.labelEndMessageDisplay.help=Le message de fin sera affich\u00e9 \u00e0 l'usager si cette case est coch\u00e9e
 modify_form.labelEndMessage=Message de fin
+modify_form.labelLabelEndMessageButton=Libell\u00e9 du bouton du message de fin
 modify_form.labelEndMessage.help=Ce message sera affich\u00e9 \u00e0 l'usager lors de la soumission du formulaire
 modify_form.labelReturnUrl=URL de retour
 modify_form.labelReturnUrl.help=URL appel\u00e9e apr\u00e8s la soumission d'un formulaire. Si vide et l'authentification est requise, redirection vers le d\u00e9tail de la r\u00e9ponse sinon, retour \u00e0 la premi\u00e8re \u00e9tape 

src/java/fr/paris/lutece/plugins/forms/resources/forms_messages_hu.properties

@@ -42,9 +42,9 @@ action.name.name=Supprimer le formulaire
 action.viewResponses.name=Voir les r\u00e9ponses
 module.forms.documentproducer.actions.extractpdf.name=Configuration du PDF
 
-action.modify.name=Modifier les param\u00e8tres du formulaire
+action.params.name=Modifier les param\u00e8tres du formulaire
 action.delete.name=Supprimer le formulaire
-action.params.name=Editer les \u00e9tapes du formulaire
+action.modify.name=Editer les \u00e9tapes du formulaire
 action.publish.name=Editer la publication du formulaire
 module.forms.documentproducer.actions.extractpdf.description=G\u00e9rer la configuration du PDF des r\u00e9ponses au formualaire
 

src/java/fr/paris/lutece/plugins/forms/resources/forms_messages_it.properties

@@ -42,9 +42,9 @@ action.name.name=Elimina il formulario
 action.viewResponses.name=Visualizza le risposte
 module.forms.documentproducer.actions.extractpdf.name=Configurazione del PDF
 
-action.modify.name=Modifica i parametri del formulario
+action.params.name=Modifica i parametri del formulario
 action.delete.name=Elimina il formulario
-action.params.name=Modifica i passaggi del formulario
+action.modify.name=Modifica i passaggi del formulario
 action.publish.name=Modifica la pubblicazione del formulario
 module.forms.documentproducer.actions.extractpdf.description=Gestisci la configurazione del PDF delle risposte al formulario
 

src/java/fr/paris/lutece/plugins/forms/resources/forms_messages_nl.properties

@@ -42,9 +42,9 @@ action.name.name=Formulier verwijderen
 action.viewResponses.name=Antwoorden bekijken
 module.forms.documentproducer.actions.extractpdf.name=PDF-configuratie
 
-action.modify.name=Formulierparameters wijzigen
+action.params.name=Formulierparameters wijzigen
 action.delete.name=Formulier verwijderen
-action.params.name=Stappen van het formulier bewerken
+action.modify.name=Stappen van het formulier bewerken
 action.publish.name=Publicatie van het formulier bewerken
 module.forms.documentproducer.actions.extractpdf.description=Beheer de PDF-configuratie van de formulierreacties
 

src/java/fr/paris/lutece/plugins/forms/resources/forms_messages_pt.properties

@@ -42,9 +42,9 @@ action.name.name=Excluir o formul\u00e1rio
 action.viewResponses.name=Ver as respostas
 module.forms.documentproducer.actions.extractpdf.name=Configura\u00e7\u00e3o do PDF
 
-action.modify.name=Modificar os par\u00e2metros do formul\u00e1rio
+action.params.name=Modificar os par\u00e2metros do formul\u00e1rio
 action.delete.name=Excluir o formul\u00e1rio
-action.params.name=Editar as etapas do formul\u00e1rio
+action.modify.name=Editar as etapas do formul\u00e1rio
 action.publish.name=Editar a publica\u00e7\u00e3o do formul\u00e1rio
 module.forms.documentproducer.actions.extractpdf.description=Gerenciar a configura\u00e7\u00e3o do PDF das respostas ao formul\u00e1rio
 

src/java/fr/paris/lutece/plugins/forms/resources/forms_messages_se.properties

@@ -42,9 +42,9 @@ action.name.name=Radera formul\u00e4ret
 action.viewResponses.name=Visa svar
 module.forms.documentproducer.actions.extractpdf.name=Konfiguration av PDF
 
-action.modify.name=\u00c4ndra formul\u00e4rparametrar
+action.params.name=\u00c4ndra formul\u00e4rparametrar
 action.delete.name=Radera formul\u00e4ret
-action.params.name=Redigera formul\u00e4rsteg
+action.modify.name=Redigera formul\u00e4rsteg
 action.publish.name=Redigera formul\u00e4rets publicering
 module.forms.documentproducer.actions.extractpdf.description=Hantera konfigurationen av PDF f\u00f6r svar p\u00e5 formul\u00e4ret