From 7c05fcd90a937028a1915cb45d234f96fbc0e069 Mon Sep 17 00:00:00 2001 From: Du Peng Date: Tue, 9 Apr 2024 09:28:49 +0200 Subject: [PATCH 1/2] (bug) user is blocked in complete profile page after login --- CHANGELOG.md | 1 + app/models/user.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e1d61747..c08a47709 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog Fab-manager ## Next release +- Fix a bug: user is blocked in complete profile page after login ## v6.3.18 2024 Avril 8 diff --git a/app/models/user.rb b/app/models/user.rb index 11edbf2f3..879e4c629 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -115,7 +115,7 @@ class User < ApplicationRecord 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?) || From cab9b143a479f46dfa7cc1249e23a157cf35dec7 Mon Sep 17 00:00:00 2001 From: Du Peng Date: Tue, 9 Apr 2024 09:30:29 +0200 Subject: [PATCH 2/2] Version 6.3.19 --- CHANGELOG.md | 2 ++ package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c08a47709..f715d8b2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog Fab-manager ## 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 diff --git a/package.json b/package.json index e5e798390..807f24878 100644 --- 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",