rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-20 14:54:15 +01:00
Code Issues Releases Activity

Merge branch 'dev' for release 6.3.19

Browse Source
This commit is contained in:
Du Peng 2024-04-09 09:30:29 +02:00
commit d70cc8ee6d
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -2,6 +2,9 @@
## Next release ## 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 ## v6.3.18 2024 Avril 8
- improvement: hide gender in signup form if not required - improvement: hide gender in signup form if not required

2
app/models/user.rb
View File

@ -115,7 +115,7 @@ class User < ApplicationRecord
end end
def need_completion? 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? || profile.first_name.blank? || profile.last_name.blank? || username.blank? ||
email.blank? || encrypted_password.blank? || group_id.nil? || email.blank? || encrypted_password.blank? || group_id.nil? ||
(Setting.get('birthday_required') && statistic_profile.birthday.blank?) || (Setting.get('birthday_required') && statistic_profile.birthday.blank?) ||

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "fab-manager", "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.", "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": [ "keywords": [
"fablab", "fablab",