From 53e703af27cbcc1076725713e6fdbe2e12fa96e3 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 24 Mar 2021 10:08:37 +0100 Subject: [PATCH 01/34] New translations app.admin.en.yml (German) --- config/locales/app.admin.de.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/locales/app.admin.de.yml b/config/locales/app.admin.de.yml index 13d1c646f..0132ae6e6 100644 --- a/config/locales/app.admin.de.yml +++ b/config/locales/app.admin.de.yml @@ -1073,6 +1073,7 @@ de: machines_sort_by: "Anzeigereihenfolge der Maschinen" fab_analytics: "Fab-Analytics" phone_required: "Telefonummer erforderlich" + address_required: "address required" tracking_id: "Tracking-ID" facebook_app_id: "Facebook App-ID" twitter_analytics: "Twitter Analytics-Konto" @@ -1109,6 +1110,9 @@ de: phone: "Telefon" phone_is_required: "Telefonummer erforderlich" phone_required_info: "Sie können festlegen, ob die Telefonnummer erforderlich sein soll, um einen neuen Benutzer auf Fab-Manager zu registrieren." + address: "Address" + address_required_info_html: "You can define if the address should be required to register a new user on Fab-manager.
Please note that, depending on your country, the regulations may requires addresses for the invoices to be valid." + address_is_required: "Address is required" captcha: "Captcha" captcha_info_html: "Sie können einen Schutz gegen Roboter einrichten, um zu verhindern, dass diese Accounts erstellen. Dieser Schutz verwendet Google reCAPTCHA. Melden Sie sich für ein API-Schlüsselpaar an, um reCaptcha zu verwenden." site_key: "Site-Schlüssel" From 0de4cb0ba3df3d1195d159094773d854314c7ee1 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 24 Mar 2021 10:08:39 +0100 Subject: [PATCH 02/34] New translations app.public.en.yml (Zulu) --- config/locales/app.public.zu.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/locales/app.public.zu.yml b/config/locales/app.public.zu.yml index 87c0b894e..4a5c6c325 100644 --- a/config/locales/app.public.zu.yml +++ b/config/locales/app.public.zu.yml @@ -84,6 +84,8 @@ zu: birth_date_is_required: "crwdns8937:0crwdne8937:0" phone_number: "crwdns8939:0crwdne8939:0" phone_number_is_required: "crwdns8941:0crwdne8941:0" + address: "crwdns21452:0crwdne21452:0" + address_is_required: "crwdns21454:0crwdne21454:0" i_authorize_Fablab_users_registered_on_the_site_to_contact_me: "crwdns8943:0crwdne8943:0" i_accept_to_receive_information_from_the_fablab: "crwdns8945:0crwdne8945:0" i_ve_read_and_i_accept_: "crwdns8947:0crwdne8947:0" From 9821d8101d92d87df57ba00fde10ea8a69fec893 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 24 Mar 2021 10:08:40 +0100 Subject: [PATCH 03/34] New translations app.admin.en.yml (Zulu) --- config/locales/app.admin.zu.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/locales/app.admin.zu.yml b/config/locales/app.admin.zu.yml index 9356cf51e..756f1189c 100644 --- a/config/locales/app.admin.zu.yml +++ b/config/locales/app.admin.zu.yml @@ -1073,6 +1073,7 @@ zu: machines_sort_by: "crwdns8409:0crwdne8409:0" fab_analytics: "crwdns19862:0crwdne19862:0" phone_required: "crwdns20626:0crwdne20626:0" + address_required: "crwdns21444:0crwdne21444:0" tracking_id: "crwdns20628:0crwdne20628:0" facebook_app_id: "crwdns20630:0crwdne20630:0" twitter_analytics: "crwdns20632:0crwdne20632:0" @@ -1109,6 +1110,9 @@ zu: phone: "crwdns20680:0crwdne20680:0" phone_is_required: "crwdns20682:0crwdne20682:0" phone_required_info: "crwdns20684:0crwdne20684:0" + address: "crwdns21446:0crwdne21446:0" + address_required_info_html: "crwdns21448:0crwdne21448:0" + address_is_required: "crwdns21450:0crwdne21450:0" captcha: "crwdns20686:0crwdne20686:0" captcha_info_html: "crwdns20688:0crwdne20688:0" site_key: "crwdns20690:0crwdne20690:0" From 0276c32e06a525638ad3050c905b240b700cc3f4 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 24 Mar 2021 10:08:43 +0100 Subject: [PATCH 04/34] New translations app.public.en.yml (Portuguese) --- config/locales/app.public.pt.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/locales/app.public.pt.yml b/config/locales/app.public.pt.yml index f03077e1a..fb81cacc9 100755 --- a/config/locales/app.public.pt.yml +++ b/config/locales/app.public.pt.yml @@ -84,6 +84,8 @@ pt: birth_date_is_required: "Data de nascimento é obrigatório." phone_number: "Número de telefone" phone_number_is_required: "Número de telefone é obrigatório." + address: "Address" + address_is_required: "Address is required" i_authorize_Fablab_users_registered_on_the_site_to_contact_me: "Eu autorizo usuários do FabLab, registrados no site, a entrarem em contato comigo" i_accept_to_receive_information_from_the_fablab: "Eu aceito receber informações do FabLab" i_ve_read_and_i_accept_: "Eu li e aceito" From 0b6fd84de117359bc81fc9702b2c3d9d54bb1e36 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 24 Mar 2021 10:08:45 +0100 Subject: [PATCH 05/34] New translations app.admin.en.yml (Portuguese) --- config/locales/app.admin.pt.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index d546eccbd..aa3646739 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -1073,6 +1073,7 @@ pt: machines_sort_by: "ordem de exibição das máquinas" fab_analytics: "Fab Analytics" phone_required: "telefone é obrigatório" + address_required: "address required" tracking_id: "tracking ID" facebook_app_id: "ID de Utilizador do Facebook" twitter_analytics: "Analisador de conta Twitter" @@ -1109,6 +1110,9 @@ pt: phone: "Telefone" phone_is_required: "Telefone é obrigatório" phone_required_info: "Você pode definir se o número de telefone deve ser exigido para registrar um novo usuário no Fab-manager." + address: "Address" + address_required_info_html: "You can define if the address should be required to register a new user on Fab-manager.
Please note that, depending on your country, the regulations may requires addresses for the invoices to be valid." + address_is_required: "Address is required" captcha: "Captcha" captcha_info_html: "Você pode configurar uma proteção contra robôs, para evitar que eles criem contas de membros. Esta proteção está usando o Google reCAPTCHA. Inscreva-se para um par de chaves de API para começar a usar o captcha." site_key: "Chave do site" From 9b2a6a4b1461fe82397b3a839c43064a8f8e26d5 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 24 Mar 2021 10:08:51 +0100 Subject: [PATCH 06/34] New translations app.public.en.yml (German) --- config/locales/app.public.de.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/locales/app.public.de.yml b/config/locales/app.public.de.yml index 88324c13b..987b82338 100644 --- a/config/locales/app.public.de.yml +++ b/config/locales/app.public.de.yml @@ -84,6 +84,8 @@ de: birth_date_is_required: "Geburtsdatum ist erforderlich." phone_number: "Telefonnummer" phone_number_is_required: "Die Angabe der Telefonnummer ist erforderlich." + address: "Address" + address_is_required: "Address is required" i_authorize_Fablab_users_registered_on_the_site_to_contact_me: "Angemeldete Benutzer dürfen mich kontaktieren" i_accept_to_receive_information_from_the_fablab: "Das Fablab darf mir Informationen schicken" i_ve_read_and_i_accept_: "Ich habe gelesen und akzeptiere" From ef724cdc6e9151d36e15023ca2f269baa9f24e51 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 24 Mar 2021 10:08:59 +0100 Subject: [PATCH 07/34] New translations app.public.en.yml (Spanish) --- config/locales/app.public.es.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/locales/app.public.es.yml b/config/locales/app.public.es.yml index 001c91c1a..7fb3afd4c 100644 --- a/config/locales/app.public.es.yml +++ b/config/locales/app.public.es.yml @@ -84,6 +84,8 @@ es: birth_date_is_required: "La fecha de nacimiento es obligatoria." phone_number: "Número de telefono" phone_number_is_required: "El número de telefono es obligatorio." + address: "Address" + address_is_required: "Address is required" i_authorize_Fablab_users_registered_on_the_site_to_contact_me: "Autorizo a los usuarios registrados en este FabLab a contactarme" i_accept_to_receive_information_from_the_fablab: "Acepto recibir información del FabLab" i_ve_read_and_i_accept_: "He leido y acepto" From 8ecb73dfa7c357501beb2e373caf560e84217dbf Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 24 Mar 2021 10:09:01 +0100 Subject: [PATCH 08/34] New translations app.admin.en.yml (Spanish) --- config/locales/app.admin.es.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index 7a7c23d3a..438da9e14 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -1073,6 +1073,7 @@ es: machines_sort_by: "del orden de visualización de las máquinas" fab_analytics: "Fab Analytics" phone_required: "phone required" + address_required: "address required" tracking_id: "tracking ID" facebook_app_id: "Facebook App ID" twitter_analytics: "Twitter analytics account" @@ -1109,6 +1110,9 @@ es: phone: "Phone" phone_is_required: "Phone required" phone_required_info: "You can define if the phone number should be required to register a new user on Fab-manager." + address: "Address" + address_required_info_html: "You can define if the address should be required to register a new user on Fab-manager.
Please note that, depending on your country, the regulations may requires addresses for the invoices to be valid." + address_is_required: "Address is required" captcha: "Captcha" captcha_info_html: "You can setup a protection against robots, to prevent them creating members accounts. This protection is using Google reCAPTCHA. Sign up for an API key pair to start using the captcha." site_key: "Site key" From 35440f40912e03521cf940b788a7adbad46c509a Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 24 Mar 2021 10:09:07 +0100 Subject: [PATCH 09/34] New translations app.public.en.yml (French) --- config/locales/app.public.fr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/app.public.fr.yml b/config/locales/app.public.fr.yml index 0a6e258d9..5417727a1 100644 --- a/config/locales/app.public.fr.yml +++ b/config/locales/app.public.fr.yml @@ -84,8 +84,8 @@ fr: birth_date_is_required: "La date de naissance est requise." phone_number: "Numéro de téléphone" phone_number_is_required: "Le numéro de téléphone est requis." - address: "Adresse" - address_is_required: "L'adresse est requise" + address: "Address" + address_is_required: "Address is required" i_authorize_Fablab_users_registered_on_the_site_to_contact_me: "J'autorise les utilisateurs du Fab Lab inscrits sur le site à me contacter" i_accept_to_receive_information_from_the_fablab: "J'accepte de recevoir des informations du Fab Lab" i_ve_read_and_i_accept_: "J'ai lu et j'accepte" From 1dcea8944b16d301854b0628aa65bed3fee34abd Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 24 Mar 2021 10:09:10 +0100 Subject: [PATCH 10/34] New translations app.admin.en.yml (French) --- config/locales/app.admin.fr.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index d1110ac75..486df56dd 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -1073,7 +1073,7 @@ fr: machines_sort_by: "l'ordre d'affichage des machines" fab_analytics: "Fab Analytics" phone_required: "téléphone requis" - address_required: "adresse requise" + address_required: "address required" tracking_id: "l'ID de suivi" facebook_app_id: "l'App ID Facebook" twitter_analytics: "compte Twitter analytics" @@ -1110,9 +1110,9 @@ fr: phone: "Téléphone" phone_is_required: "Téléphone requis" phone_required_info: "Vous pouvez définir si le numéro de téléphone doit être requis, lors de l'enregistrement d'un nouvel utilisateur sur Fab-manager." - address: "Adresse" - address_required_info_html: "Vous pouvez définir si l'adresse doit être requise, lors de l'enregistrement d'un nouvel utilisateur sur Fab-manager.
Veuillez noter que, selon votre pays, la réglementation peut exiger des adresses pour que les factures soient valides." - address_is_required: "Adresse requise" + address: "Address" + address_required_info_html: "You can define if the address should be required to register a new user on Fab-manager.
Please note that, depending on your country, the regulations may requires addresses for the invoices to be valid." + address_is_required: "Address is required" captcha: "Captcha" captcha_info_html: "Vous pouvez mettre en place une protection contre les robots, pour les empêcher de créer des comptes membre. Cette protection utilise Google reCAPTCHA. Inscrivez vous pour obtenir une paire de clefs d'API afin d'utiliser le captcha." site_key: "Clef de site" From 78b007a9ecb60e71496848a6494efa830799c406 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 24 Mar 2021 15:39:18 +0100 Subject: [PATCH 11/34] [bug] unable to add a new authorized file type for project's CAD files --- CHANGELOG.md | 4 +++- .../settings/select-multiple-setting.js | 23 ++++++++++--------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d79ab451..cb49f15b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,11 @@ # Changelog Fab-manager +- Fix a bug: unable to add a new authorized file type for project's CAD files + ## v4.7.6 2021 March 24 - Ability to disable the trainings module - Ability to set the address as a mandatory field -- The address is new requested when creating an account +- The address is now requested when creating an account - The profile completion page is less fuzzy for people landing on it without enabled SSO - Prevent showing error message when testing for old versions during upgrade - In the email notification, sent to admins on account creation, show the group of the user diff --git a/app/frontend/src/javascript/directives/settings/select-multiple-setting.js b/app/frontend/src/javascript/directives/settings/select-multiple-setting.js index 591433105..a899d0d0f 100644 --- a/app/frontend/src/javascript/directives/settings/select-multiple-setting.js +++ b/app/frontend/src/javascript/directives/settings/select-multiple-setting.js @@ -49,17 +49,18 @@ Application.Directives.directive('selectMultipleSetting', ['Setting', 'growl', ' titleNew: function () { return $scope.titleNew; }, descriptionNew: function () { return $scope.descriptionNew; } }, - controller: function ($scope, $uibModalInstance, titleNew, descriptionNew) { - $scope.value = undefined; - $scope.titleNew = titleNew; - $scope.descriptionNew = descriptionNew; - $scope.ok = function () { - $uibModalInstance.close($scope.value); - }; - $scope.dismiss = function () { - $uibModalInstance.dismiss('cancel'); - }; - } + controller: ['$scope', '$uibModalInstance', 'titleNew', 'descriptionNew', + function ($scope, $uibModalInstance, titleNew, descriptionNew) { + $scope.value = undefined; + $scope.titleNew = titleNew; + $scope.descriptionNew = descriptionNew; + $scope.ok = function () { + $uibModalInstance.close($scope.value); + }; + $scope.dismiss = function () { + $uibModalInstance.dismiss('cancel'); + }; + }] }).result.finally(null).then(function (val) { const options = Array.from($scope.options); if (typeof $scope.beforeAdd === 'function') { val = $scope.beforeAdd(val); } From b5e0572a6ba03f13b2e7190dc41bde24e313b540 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 24 Mar 2021 15:51:02 +0100 Subject: [PATCH 12/34] fix devise modal --- app/frontend/src/javascript/lib/devise-modal.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/frontend/src/javascript/lib/devise-modal.js b/app/frontend/src/javascript/lib/devise-modal.js index b1a82f0d1..ea4cff117 100644 --- a/app/frontend/src/javascript/lib/devise-modal.js +++ b/app/frontend/src/javascript/lib/devise-modal.js @@ -29,7 +29,7 @@ if (!promise) { promise = $uibModal.open({ templateUrl: '/shared/deviseModal.html', - controller: function ($scope, $uibModalInstance) { + controller: ['$scope', '$uibModalInstance', function ($scope, $uibModalInstance) { const user = $scope.user = {}; $scope.login = function () { $uibModalInstance.close(user); @@ -37,7 +37,7 @@ $scope.dismiss = function () { $uibModalInstance.dismiss('cancel'); }; - } + }] }).result.finally(reset).then(Auth.login); } retryRequestAfterLogin(); From 937ed72dc7885883c3b0302e71e82c188f1554ea Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 24 Mar 2021 16:02:35 +0100 Subject: [PATCH 13/34] [bug] the view is not refreshed when deleting a recurring slot --- CHANGELOG.md | 1 + config/locales/app.admin.en.yml | 2 +- config/locales/app.admin.fr.yml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb49f15b9..c983575d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Changelog Fab-manager +- Fix a bug: the view is not refreshed when deleting a recurring slot - Fix a bug: unable to add a new authorized file type for project's CAD files ## v4.7.6 2021 March 24 diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index 3d0b3500c..cad9927fc 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -73,7 +73,7 @@ en: labels: "Label(s):" none: "None" slot_successfully_deleted: "The slot {START} - {END} has been successfully deleted" - slots_deleted: "The slot of {START}, and {COUNT, plural, =1{one other} other{{COUNT} others}}}, have been deleted" + slots_deleted: "The slot of {START}, and {COUNT, plural, =1{one other} other{{COUNT} others}}, have been deleted" unable_to_delete_the_slot: "Unable to delete the slot {START} - {END}, probably because it's already reserved by a member" slots_not_deleted: "On {TOTAL} slots, {COUNT, plural, =1{one was not deleted} other{{COUNT} were not deleted}}. Some reservations may exist on {COUNT, plural, =1{it} other{them}}." you_should_select_at_least_a_machine: "You should select at least one machine on this slot." diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index d1110ac75..a84a5384e 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -73,7 +73,7 @@ fr: labels: "Étiquette(s) :" none: "Aucune" slot_successfully_deleted: "Le créneau {START} - {END} a bien été supprimé" - slots_deleted: "Le créneau du {START}, ainsi {COUNT, plural, =1{qu'un autre créneau} other{que {COUNT} autres créneaux}}}, ont été supprimés" + slots_deleted: "Le créneau du {START}, ainsi {COUNT, plural, =1{qu'un autre créneau} other{que {COUNT} autres créneaux}}, ont été supprimés" unable_to_delete_the_slot: "Le créneau {START} - {END} n'a pu être supprimé, probablement car il est déjà réservé par un membre" slots_not_deleted: "Sur {TOTAL} créneaux, {COUNT, plural, =1{un n'a pas pu être supprimé} other{{COUNT} n'ont pas pu être supprimés}}. Il est possible que des réservations existent sur {COUNT, plural, =1{celui-ci} other{ceux-ci}}." you_should_select_at_least_a_machine: "Vous devriez sélectionner au moins une machine pour ce créneau." From c50e69b35177f430ab8334fe3251fbeb4a024778 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 24 Mar 2021 18:24:03 +0100 Subject: [PATCH 14/34] Enforced validation on required input fields --- CHANGELOG.md | 1 + .../templates/admin/coupons/_form.html | 8 ++++---- app/frontend/templates/admin/plans/_form.html | 10 +++++----- app/frontend/templates/admin/plans/edit.html | 4 ++-- .../templates/admin/settings/number.html | 2 +- .../templates/admin/settings/reservations.html | 6 +++--- .../admin/settings/select-multiple.html | 2 +- .../templates/admin/settings/select.html | 2 +- .../templates/admin/settings/text.html | 2 +- .../templates/admin/statistics/export.html | 4 ++-- .../templates/admin/statistics/graphs.html | 4 ++-- .../templates/admin/statistics/index.html | 18 +++++++++--------- .../templates/shared/ConfirmationNewModal.html | 4 ++-- .../templates/shared/_partner_new_modal.html | 6 +++--- app/frontend/templates/shared/deviseModal.html | 4 ++-- .../templates/shared/passwordNewModal.html | 2 +- 16 files changed, 40 insertions(+), 39 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c983575d9..095d2de7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Changelog Fab-manager +- Enforced validation on required input fields - Fix a bug: the view is not refreshed when deleting a recurring slot - Fix a bug: unable to add a new authorized file type for project's CAD files diff --git a/app/frontend/templates/admin/coupons/_form.html b/app/frontend/templates/admin/coupons/_form.html index f326788e2..b4087bbbe 100644 --- a/app/frontend/templates/admin/coupons/_form.html +++ b/app/frontend/templates/admin/coupons/_form.html @@ -4,7 +4,7 @@ name="coupon[name]" class="form-control" ng-model="coupon.name" - required="required"/> + required="true"/> {{ 'app.shared.coupon.name_is_required' }} @@ -16,7 +16,7 @@ ng-model="coupon.code" ng-pattern="/^[A-Z0-9\-]+$/" ng-disabled="mode == 'EDIT'" - required="required"/> + required="true"/> {{ 'app.shared.coupon.code_is_required' }} {{ 'app.shared.coupon.code_must_be_composed_of_capital_letters_digits_and_or_dashes' }} @@ -28,7 +28,7 @@ class="form-control" ng-model="coupon.type" ng-disabled="mode == 'EDIT'" - required="required"> + required="true"> @@ -73,7 +73,7 @@ name="coupon[validity_per_user]" class="form-control" ng-model="coupon.validity_per_user" - required="required" + required="true" ng-disabled="mode == 'EDIT'" ng-options="validityName(validity) for validity in validities"> diff --git a/app/frontend/templates/admin/plans/_form.html b/app/frontend/templates/admin/plans/_form.html index 8cfdcbcca..90af720e7 100644 --- a/app/frontend/templates/admin/plans/_form.html +++ b/app/frontend/templates/admin/plans/_form.html @@ -8,7 +8,7 @@ class="form-control" ng-maxlength="24" ng-model="plan.base_name" - required="required"/> + required="true"/> {{ 'app.shared.plan.name_is_required' }} {{ 'app.shared.plan.name_length_must_be_less_than_24_characters' }} @@ -18,7 +18,7 @@ name="plan[type]" class="form-control" ng-model="plan.type" - required="required" + required="true" ng-disabled="method == 'PATCH'"> @@ -31,7 +31,7 @@ name="plan[group_id]" class="form-control" ng-model="plan.group_id" - required="required" + required="true" ng-if="method !== 'PATCH'" ng-options="item.id as translateLabel(item, 'name') group by translateLabel(item, 'category') for item in groups track by item.id"> @@ -55,7 +55,7 @@ class="form-control" ng-model="plan.interval" ng-disabled="method == 'PATCH'" - required="required"> + required="true"> @@ -71,7 +71,7 @@ type="number" ng-model="plan.interval_count" ng-disabled="method == 'PATCH'" - required="required" + required="true" min="1"/> {{ 'app.shared.plan.number_of_periods_is_required' }} diff --git a/app/frontend/templates/admin/plans/edit.html b/app/frontend/templates/admin/plans/edit.html index 9eaf1b6f2..37c2f25b2 100644 --- a/app/frontend/templates/admin/plans/edit.html +++ b/app/frontend/templates/admin/plans/edit.html @@ -65,7 +65,7 @@
{{currencySymbol}} - +
@@ -86,7 +86,7 @@
{{currencySymbol}} - +
diff --git a/app/frontend/templates/admin/settings/number.html b/app/frontend/templates/admin/settings/number.html index 3664e2ce0..46b1474d3 100644 --- a/app/frontend/templates/admin/settings/number.html +++ b/app/frontend/templates/admin/settings/number.html @@ -5,7 +5,7 @@
- + {{ helperText | translate }} diff --git a/app/frontend/templates/admin/settings/reservations.html b/app/frontend/templates/admin/settings/reservations.html index 13f340681..4106d82b0 100644 --- a/app/frontend/templates/admin/settings/reservations.html +++ b/app/frontend/templates/admin/settings/reservations.html @@ -30,7 +30,7 @@ classes="col-md-4" fa-icon="fa-calendar" min="1" - required="required"> + required="true"> + required="true">
@@ -101,7 +101,7 @@ classes="col-md-4" fa-icon="fa-clock-o" min="1" - required="required"> + required="true"> diff --git a/app/frontend/templates/admin/settings/select-multiple.html b/app/frontend/templates/admin/settings/select-multiple.html index be53200c8..1a020aed7 100644 --- a/app/frontend/templates/admin/settings/select-multiple.html +++ b/app/frontend/templates/admin/settings/select-multiple.html @@ -4,7 +4,7 @@ diff --git a/app/frontend/templates/admin/settings/select.html b/app/frontend/templates/admin/settings/select.html index 69541bb72..f17fa48b8 100644 --- a/app/frontend/templates/admin/settings/select.html +++ b/app/frontend/templates/admin/settings/select.html @@ -4,7 +4,7 @@ +
  • {{ 'app.admin.statistics.end' }}
    - +
    • @@ -98,7 +98,7 @@ ng-options="f.label for f in filters track by f.key" ng-change="customFilter.value = null" name="customFilterCriterion" - required="required" + required="true" class="form-control"> @@ -109,7 +109,7 @@ - +
    @@ -136,7 +136,7 @@ ng-model="customFilter.value" ng-options="v.label for v in customFilter.criterion.values" name="customFilterValue" - required="required"> + required="true"> + required="true"/>
    @@ -194,7 +194,7 @@ show-button-bar="false" placeholder="{{ 'app.admin.statistics.start' | translate }}" ng-click="toggleStartDatePicker($event)" - required="required"/> + required="true"/>