From 49d05b61fcdd366f8a336d9f8b14601f853c3e7c Mon Sep 17 00:00:00 2001
From: Du Peng <gnepud@gmail.com>
Date: Tue, 9 Apr 2024 16:11:12 +0200
Subject: [PATCH] (feat) hide gender in member create/edit form if not required

---
 CHANGELOG.md                                                  | 1 +
 .../src/javascript/components/user/user-profile-form.tsx      | 4 +++-
 app/frontend/templates/shared/_admin_form.html                | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 797e0ea4d..7a487e3ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Next release
 
+- improvement: hide gender in member create/edit form if not required
 - Fix a bug: unable to update member's profile
 
 ## v6.3.19 2024 Avril 9
diff --git a/app/frontend/src/javascript/components/user/user-profile-form.tsx b/app/frontend/src/javascript/components/user/user-profile-form.tsx
index 6b09f6fef..a0ac24454 100644
--- a/app/frontend/src/javascript/components/user/user-profile-form.tsx
+++ b/app/frontend/src/javascript/components/user/user-profile-form.tsx
@@ -189,7 +189,9 @@ export const UserProfileForm: React.FC<UserProfileFormProps> = ({ action, size,
       <div className="fields-group">
         <div className="personnal-data">
           <h4>{t('app.shared.user_profile_form.personal_data')}</h4>
-          <GenderInput register={register} disabled={isDisabled} required={fieldsSettings.get('gender_required') === 'true'} tooltip={t('app.shared.user_profile_form.used_for_statistics')} />
+          {fieldsSettings.get('gender_required') === 'true' &&
+            <GenderInput register={register} disabled={isDisabled} required={fieldsSettings.get('gender_required') === 'true'} tooltip={t('app.shared.user_profile_form.used_for_statistics')} />
+          }
           <div className="names">
             <FormInput id="profile_attributes.last_name"
                        register={register}
diff --git a/app/frontend/templates/shared/_admin_form.html b/app/frontend/templates/shared/_admin_form.html
index 2b33f38c7..91f1f262b 100644
--- a/app/frontend/templates/shared/_admin_form.html
+++ b/app/frontend/templates/shared/_admin_form.html
@@ -1,6 +1,6 @@
 <div class="row m-t">
   <div class="col-sm-offset-3 col-sm-6">
-    <div class="form-group" ng-class="{'has-error': adminForm['admin[statistic_profile_attributes][gender]'].$dirty && adminForm['admin[statistic_profile_attributes][gender]'].$invalid}">
+    <div ng-if="genderRequired" class="form-group" ng-class="{'has-error': adminForm['admin[statistic_profile_attributes][gender]'].$dirty && adminForm['admin[statistic_profile_attributes][gender]'].$invalid}">
       <label class="checkbox-inline btn btn-default">
         <input type="radio"
                name="admin[statistic_profile_attributes][gender]"