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

Merge branch 'standalone_develop' into pre_trustie_server

This commit is contained in:
yystopf 2023-03-31 17:24:28 +08:00
parent 780d4d8f1f ea26c2f559
commit 6167e4aa0b
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/queries/projects/list_my_query.rb
View File

@ -36,7 +36,7 @@ class Projects::ListMyQuery < ApplicationQuery
projects = projects.where(id: fork_ids) projects = projects.where(id: fork_ids)
elsif params[:category].to_s == "admin" elsif params[:category].to_s == "admin"
normal_projects = projects.joins(members: :roles).where(members: {user_id: user.id}, roles: {name: %w(Manager)}).to_sql normal_projects = projects.joins(members: :roles).where(members: {user_id: user.id}, roles: {name: %w(Manager)}).to_sql
org_projects = projects.joins(team_projects: [team: :team_users]).where(teams: {authorize: "owner"},team_users: {user_id: user.id}).to_sql org_projects = projects.joins(team_projects: [team: :team_users]).where(teams: {authorize: %w(owner admin)},team_users: {user_id: user.id}).to_sql
projects = Project.from("( #{ normal_projects} UNION #{ org_projects } ) AS projects").distinct projects = Project.from("( #{ normal_projects} UNION #{ org_projects } ) AS projects").distinct
# elsif params[:category].to_s == "public" # elsif params[:category].to_s == "public"
# projects = projects.visible.joins(:members).where(members: { user_id: user.id }) # projects = projects.visible.joins(:members).where(members: { user_id: user.id })

10
app/services/api/v1/users/update_email_service.rb
View File

@ -61,13 +61,17 @@ class Api::V1::Users::UpdateEmailService < ApplicationService
end end
def excute_data_to_gitea def excute_data_to_gitea
Rails.logger.info request_body
@gitea_data = $gitea_client.patch_admin_users_by_username(@user.login, {body: request_body.to_json}) @gitea_data = $gitea_client.patch_admin_users_by_username(@user.login, {body: request_body.to_json})
end end
def excute_change_email_from_gitea def excute_change_email_from_gitea
$gitea_client.delete_user_emails({body: {emails: [@old_mail]}.to_json, query: request_params}) emails = $gitea_client.get_user_emails({query: request_params})
$gitea_client.post_user_emails({body: {emails: [@mail]}.to_json, query: request_params}) puts "emails=#{emails}"
emails.each do |email|
email = email.stringify_keys
next if email["email"] == @mail
$gitea_client.delete_user_emails({body: {emails: [email["email"]]}.to_json, query: request_params})
end
end end
def remove_old_cache_for_user def remove_old_cache_for_user