From 5226196f4eb0cae9b0453f1c6ae751bbfa204028 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 31 Mar 2023 14:57:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86=E7=9A=84=E9=A1=B9=E7=9B=AE=E9=9C=80?= =?UTF-8?q?=E5=8C=85=E6=8B=ACadmin=E5=9B=A2=E9=98=9F=E4=B8=8B=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/queries/projects/list_my_query.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/queries/projects/list_my_query.rb b/app/queries/projects/list_my_query.rb index 510ecf9fd..acea71f31 100644 --- a/app/queries/projects/list_my_query.rb +++ b/app/queries/projects/list_my_query.rb @@ -36,7 +36,7 @@ class Projects::ListMyQuery < ApplicationQuery projects = projects.where(id: fork_ids) elsif params[:category].to_s == "admin" 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 # elsif params[:category].to_s == "public" # projects = projects.visible.joins(:members).where(members: { user_id: user.id }) From 6f0595616d8f63b6dbcb75652e3f64d7e0d537b2 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 31 Mar 2023 17:23:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E9=82=AE=E7=AE=B1=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/api/v1/users/update_email_service.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/services/api/v1/users/update_email_service.rb b/app/services/api/v1/users/update_email_service.rb index 7841a7100..93ddf706d 100644 --- a/app/services/api/v1/users/update_email_service.rb +++ b/app/services/api/v1/users/update_email_service.rb @@ -30,7 +30,7 @@ class Api::V1::Users::UpdateEmailService < ApplicationService ActiveRecord::Base.transaction do change_user_email excute_data_to_gitea - excute_change_email_from_gitea + excute_change_email_from_gitea remove_old_cache_for_user end @@ -61,13 +61,17 @@ class Api::V1::Users::UpdateEmailService < ApplicationService end 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}) end def excute_change_email_from_gitea - $gitea_client.delete_user_emails({body: {emails: [@old_mail]}.to_json, query: request_params}) - $gitea_client.post_user_emails({body: {emails: [@mail]}.to_json, query: request_params}) + emails = $gitea_client.get_user_emails({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 def remove_old_cache_for_user