From 8d3e60526139a2200b402356b6060a36ed095c58 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Mon, 20 Nov 2017 18:30:16 -0800 Subject: [PATCH] fixed create new form bug --- public/form_modules/forms/base/config/i18n/english.js | 3 +++ public/form_modules/forms/base/config/i18n/french.js | 7 +++++-- public/form_modules/forms/base/config/i18n/german.js | 7 +++++-- public/form_modules/forms/base/config/i18n/italian.js | 3 +++ public/form_modules/forms/base/config/i18n/spanish.js | 3 +++ .../directiveViews/form/submit-form.client.view.html | 8 ++++++-- .../admin/directives/configure-form.client.directive.js | 9 ++++++++- .../directiveViews/form/configure-form.client.view.html | 8 +++++++- 8 files changed, 40 insertions(+), 8 deletions(-) diff --git a/public/form_modules/forms/base/config/i18n/english.js b/public/form_modules/forms/base/config/i18n/english.js index fe12abaf..9941d5ae 100644 --- a/public/form_modules/forms/base/config/i18n/english.js +++ b/public/form_modules/forms/base/config/i18n/english.js @@ -34,6 +34,9 @@ angular.module('view-form').config(['$translateProvider', function ($translatePr ADD_NEW_LINE_INSTR: 'Press SHIFT+ENTER to add a newline', ERROR: 'Error', + LOADING_LABEL: 'Loading', + WAIT_LABEL: 'Please wait', + FORM_404_HEADER: '404 - Form Does Not Exist', FORM_404_BODY: 'The form you are trying to access does not exist. Sorry about that!', diff --git a/public/form_modules/forms/base/config/i18n/french.js b/public/form_modules/forms/base/config/i18n/french.js index c544ea1f..a3a3c43b 100644 --- a/public/form_modules/forms/base/config/i18n/french.js +++ b/public/form_modules/forms/base/config/i18n/french.js @@ -33,13 +33,16 @@ angular.module('view-form').config(['$translateProvider', function ($translatePr OPTION_PLACEHOLDER: 'Tapez ou sélectionnez une option', ADD_NEW_LINE_INSTR: 'Appuyez sur MAJ + ENTRÉE pour ajouter une nouvelle ligne', ERROR: 'Erreur', + + LOADING_LABEL: 'Chargement', + WAIT_LABEL: "Veuillez patienter", FORM_404_HEADER: '404 - Le formulaire n\'existe pas', FORM_404_BODY: 'Le formulaire auquel vous essayez d\'accéder n\'existe pas. Désolé pour ça!', FORM_UNAUTHORIZED_HEADER: 'Non autorisé à accéder au formulaire', -   FORM_UNAUTHORIZED_BODY1: 'Le formulaire auquel vous essayez d\'accéder est actuellement privé et inaccessible publiquement.', -   FORM_UNAUTHORIZED_BODY2: 'Si vous êtes le propriétaire du formulaire, vous pouvez le définir sur "Public" dans le panneau "Configuration" du formulaire admin.', +   FORM_UNAUTHORIZED_BODY1: 'Le formulaire auquel vous essayez d\'accéder est actuellement privé et inaccessible publiquement.', +   FORM_UNAUTHORIZED_BODY2: 'Si vous êtes le propriétaire du formulaire, vous pouvez le définir sur "Public" dans le panneau "Configuration" du formulaire admin.', }); }]); diff --git a/public/form_modules/forms/base/config/i18n/german.js b/public/form_modules/forms/base/config/i18n/german.js index df335ce5..f9d53732 100644 --- a/public/form_modules/forms/base/config/i18n/german.js +++ b/public/form_modules/forms/base/config/i18n/german.js @@ -33,13 +33,16 @@ angular.module('view-form').config(['$translateProvider', function ($translatePr OPTION_PLACEHOLDER: 'Geben oder wählen Sie eine Option aus', ADD_NEW_LINE_INSTR: 'Drücken Sie UMSCHALT + EINGABETASTE, um eine neue Zeile hinzuzufügen', ERROR: 'Fehler', + + LOADING_LABEL: 'Laden', + WAIT_LABEL: 'Bitte warten', FORM_404_HEADER: '404 - Formular existiert nicht', FORM_404_BODY: 'Das Formular, auf das Sie zugreifen möchten, existiert nicht. Das tut mir leid!', FORM_UNAUTHORIZED_HEADER: 'Nicht zum Zugriffsformular berechtigt\' ', -   FORM_UNAUTHORIZED_BODY1: 'Das Formular, auf das Sie zugreifen möchten, ist derzeit privat und nicht öffentlich zugänglich.', -   FORM_UNAUTHORIZED_BODY2: 'Wenn Sie der Eigentümer des Formulars sind, können Sie es im Fenster "Konfiguration" im Formular admin auf "Öffentlich" setzen.', +   FORM_UNAUTHORIZED_BODY1: 'Das Formular, auf das Sie zugreifen möchten, ist derzeit privat und nicht öffentlich zugänglich.', +   FORM_UNAUTHORIZED_BODY2: 'Wenn Sie der Eigentümer des Formulars sind, können Sie es im Fenster "Konfiguration" im Formular admin auf "Öffentlich" setzen.', }); }]); diff --git a/public/form_modules/forms/base/config/i18n/italian.js b/public/form_modules/forms/base/config/i18n/italian.js index 62058a2e..20f34143 100644 --- a/public/form_modules/forms/base/config/i18n/italian.js +++ b/public/form_modules/forms/base/config/i18n/italian.js @@ -33,6 +33,9 @@ angular.module('view-form').config(['$translateProvider', function ($translatePr OPTION_PLACEHOLDER: 'Digitare o selezionare un\'opzione', ADD_NEW_LINE_INSTR: 'Premere SHIFT + INVIO per aggiungere una nuova riga', ERROR: 'Errore', + + LOADING_LABEL: 'Caricamento', + WAIT_LABEL: "Attendere prego", FORM_404_HEADER: '404 - Il modulo non esiste', FORM_404_BODY: 'La forma che stai cercando di accedere non esiste. Ci dispiace!', diff --git a/public/form_modules/forms/base/config/i18n/spanish.js b/public/form_modules/forms/base/config/i18n/spanish.js index 86861eb3..90c0b8ca 100644 --- a/public/form_modules/forms/base/config/i18n/spanish.js +++ b/public/form_modules/forms/base/config/i18n/spanish.js @@ -34,6 +34,9 @@ angular.module('view-form').config(['$translateProvider', function ($translatePr ADD_NEW_LINE_INSTR: 'Presione MAYÚS + ENTRAR para agregar una nueva línea', ERROR: 'Error', + LOADING_LABEL: 'Cargando', + WAIT_LABEL: 'Espera', + FORM_404_HEADER: '404 - La forma no existe', FORM_404_BODY: 'El formulario al que intenta acceder no existe. ¡Lo siento por eso!', diff --git a/public/form_modules/forms/base/views/directiveViews/form/submit-form.client.view.html b/public/form_modules/forms/base/views/directiveViews/form/submit-form.client.view.html index 8b065343..dcadc15b 100755 --- a/public/form_modules/forms/base/views/directiveViews/form/submit-form.client.view.html +++ b/public/form_modules/forms/base/views/directiveViews/form/submit-form.client.view.html @@ -46,7 +46,8 @@
@@ -55,7 +56,10 @@ {{ 'COMPLETING_NEEDED' | translate:translateAdvancementData }}
- diff --git a/public/modules/forms/admin/directives/configure-form.client.directive.js b/public/modules/forms/admin/directives/configure-form.client.directive.js index 79bb1755..7c5b6f93 100644 --- a/public/modules/forms/admin/directives/configure-form.client.directive.js +++ b/public/modules/forms/admin/directives/configure-form.client.directive.js @@ -12,7 +12,6 @@ angular.module('forms').directive('configureFormDirective', ['$rootScope', '$sta $rootScope.myform = $scope.myform; $scope.languages = $rootScope.languages; $scope.resetForm = $rootScope.resetForm; - $scope.update = $rootScope.update; Quill.register('modules/placeholder', PlaceholderModule.default(Quill)) $scope.customModules = { @@ -78,6 +77,14 @@ angular.module('forms').directive('configureFormDirective', ['$rootScope', '$sta } }, 500); }); + + $scope.loading = false; + $scope.saveChanges = function(){ + $scope.loading = true; + $rootScope.update(false, $scope.myform, false, false, function(){ + $scope.loading = false; + }); + }; } }; } diff --git a/public/modules/forms/admin/views/directiveViews/form/configure-form.client.view.html b/public/modules/forms/admin/views/directiveViews/form/configure-form.client.view.html index 3da080f9..bae28089 100644 --- a/public/modules/forms/admin/views/directiveViews/form/configure-form.client.view.html +++ b/public/modules/forms/admin/views/directiveViews/form/configure-form.client.view.html @@ -9,7 +9,13 @@
- +