Merge branch 'master' into dev

sleede · Apr 8, 2024 · 6e41e22 · 6e41e22
2 parents 9306703 + f56fabd
commit 6e41e22
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Next release
 
+## v6.3.18 2024 Avril 8
+
+- improvement: hide gender in signup form if not required
+
 ## v6.3.17 2024 Avril 8
 
 - improvement: add loader for create/delete availability slot

diff --git a/app/frontend/src/javascript/controllers/application.js b/app/frontend/src/javascript/controllers/application.js
@@ -81,7 +81,7 @@ Application.Controllers.controller('ApplicationController', ['$rootScope', '$sco
           size: 'md',
           resolve: {
             settingsPromise: ['Setting', function (Setting) {
-              return Setting.query({ names: "['phone_required', 'recaptcha_site_key', 'confirmation_required', 'address_required']" }).$promise;
+              return Setting.query({ names: "['phone_required', 'recaptcha_site_key', 'confirmation_required', 'address_required', 'gender_required', 'birthday_required']" }).$promise;
             }],
             profileCustomFieldsPromise: ['ProfileCustomField', function (ProfileCustomField) { return ProfileCustomField.query({}).$promise; }],
             proofOfIdentityTypesPromise: ['SupportingDocumentType', function (SupportingDocumentType) { return SupportingDocumentType.query({}).$promise; }]

diff --git a/app/frontend/templates/shared/signupModal.html b/app/frontend/templates/shared/signupModal.html
@@ -8,7 +8,7 @@ <h1 translate>{{ 'app.public.common.create_your_account' }}</h1>
 
     <div class="well m-b-n">
       <form role="form" name="signupForm" class="form-horizontal signup-form" novalidate autocomplete="off" ng-keydown="signupForm.$valid && $event.which == 13 && ok()">
-        <div class="form-group" ng-class="{'has-error': signupForm.gender.$dirty && signupForm.gender.$invalid}">
+        <div ng-if="genderRequired" class="form-group" ng-class="{'has-error': signupForm.gender.$dirty && signupForm.gender.$invalid}">
           <div class="col-sm-12">
             <label class="checkbox-inline">
               <input type="radio"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fab-manager",
-  "version": "6.3.17",
+  "version": "6.3.18",
   "description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.",
   "keywords": [
     "fablab",