floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

取消lastname同步nickname

This commit is contained in:
xxq250 2022-11-23 18:15:27 +08:00
parent 1c71eab72e 06c0ac65bf
commit 29d2ca63ed
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/user.rb
View File

@ -193,7 +193,8 @@ class User < Owner
:show_email, :show_location, :show_department, :super_description, :show_super_description, :show_email, :show_location, :show_department, :super_description, :show_super_description,
:technical_title, :province, :city, :custom_department, to: :user_extension, allow_nil: true :technical_title, :province, :city, :custom_department, to: :user_extension, allow_nil: true
before_save :update_hashed_password, :set_lastname # before_save :update_hashed_password, :set_lastname
before_save :update_hashed_password
after_save :reset_cache_data after_save :reset_cache_data
after_create do after_create do
SyncTrustieJob.perform_later("user", 1) if allow_sync_to_trustie? SyncTrustieJob.perform_later("user", 1) if allow_sync_to_trustie?

2
app/views/users/get_user_info.json.jbuilder
View File

@ -11,7 +11,7 @@ json.user_identity @user.identity
json.tidding_count 0 json.tidding_count 0
json.user_phone_binded @user.phone.present? json.user_phone_binded @user.phone.present?
json.need_edit_info @user.need_edit_info? json.need_edit_info @user.need_edit_info?
# json.phone @user.phone json.phone @user.phone
# json.email @user.mail # json.email @user.mail
json.profile_completed @user.profile_is_completed? json.profile_completed @user.profile_is_completed?
json.professional_certification @user.professional_certification json.professional_certification @user.professional_certification

2
db/migrate/20221123023450_update_user_nick_name.rb
View File

@ -17,5 +17,7 @@ class UpdateUserNickName < ActiveRecord::Migration[5.2]
execute("ALTER TABLE `commit_logs` MODIFY `message` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;") execute("ALTER TABLE `commit_logs` MODIFY `message` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;")
execute("ALTER TABLE `user_extensions` MODIFY `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;")
end end
end end