Merge branch 'dev' for release 6.3.19

sleede · Apr 9, 2024 · d70cc8e · d70cc8e
2 parents f56fabd + cab9b14
commit d70cc8e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Next release
 
+## v6.3.19 2024 Avril 9
+- Fix a bug: user is blocked in complete profile page after login
+
 ## v6.3.18 2024 Avril 8
 
 - improvement: hide gender in signup form if not required

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -115,7 +115,7 @@ def active_for_authentication?
   end
 
   def need_completion?
-    (Setting.get('gender_required') && statistic_profile.gender.blank?) ||
+    (Setting.get('gender_required') && statistic_profile.gender.nil?) ||
       profile.first_name.blank? || profile.last_name.blank? || username.blank? ||
       email.blank? || encrypted_password.blank? || group_id.nil? ||
       (Setting.get('birthday_required') && statistic_profile.birthday.blank?) ||

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fab-manager",
-  "version": "6.3.18",
+  "version": "6.3.19",
   "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",