From 6f062f1c4e854cf2bc49110986dd82ca5bad3987 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 22 May 2020 14:51:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9member=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=9A=84=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/members/_member.json.jbuilder | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/members/_member.json.jbuilder b/app/views/members/_member.json.jbuilder index 280f7ef98..5a3d3dc00 100644 --- a/app/views/members/_member.json.jbuilder +++ b/app/views/members/_member.json.jbuilder @@ -2,3 +2,4 @@ json.id user.id json.name user.real_name json.login user.login json.image_url url_to_avatar(user) +json.email user.try(:mail) From 9b302875ed3d090bcdef53977be8b23a4f023345 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 22 May 2020 15:41:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9project=20=E7=9A=84manage?= =?UTF-8?q?rs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/jobs/apply_join_project_notify_job.rb | 2 +- app/models/user.rb | 2 +- app/services/projects/apply_join_service.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/jobs/apply_join_project_notify_job.rb b/app/jobs/apply_join_project_notify_job.rb index fe46bf0e0..23056332b 100644 --- a/app/jobs/apply_join_project_notify_job.rb +++ b/app/jobs/apply_join_project_notify_job.rb @@ -23,7 +23,7 @@ class ApplyJoinProjectNotifyJob < ApplicationJob end Tiding.bulk_insert(*attrs) do |worker| - project.manager_members.each do |manager| + project.managers.each do |manager| worker.add(same_attrs.merge(user_id: manager.user_id)) end end diff --git a/app/models/user.rb b/app/models/user.rb index 859c02986..3d946731e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -130,7 +130,7 @@ class User < ApplicationRecord end def project_manager?(project) - project.manager_members.exists?(user: self) || self.admin? + project.managers.exists?(user: self) || self.admin? end # 学号 diff --git a/app/services/projects/apply_join_service.rb b/app/services/projects/apply_join_service.rb index d14b3dc52..3601ee42c 100644 --- a/app/services/projects/apply_join_service.rb +++ b/app/services/projects/apply_join_service.rb @@ -55,7 +55,7 @@ class Projects::ApplyJoinService < ApplicationService applied_user_id: user.id, role: role_value, project_id: project.id } - project.manager_members.each do |manager| + project.managers.each do |manager| worker.add(base_attr.merge(user_id: manager.user_id)) end end From 7ca8dcbebdca0c5ecfd82f2f14910ea4e4c693d2 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 22 May 2020 16:25:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=8F=E4=BD=9C?= =?UTF-8?q?=E8=80=85=E7=AD=9B=E9=80=89=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/members_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 72627fbfb..0a47f6a0d 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -19,7 +19,7 @@ class MembersController < ApplicationController search = params[:search].to_s.downcase role = params[:role].to_s scope = scope.joins(:user).where("LOWER(concat(users.lastname, users.firstname, users.login, users.mail)) LIKE ?", "%#{search.split(" ").join('|')}%") if search.present? - scope = scope.joins(:roles).where("roles.name LIKE ?", "%#{role.split(" ")}%") if role.present? + scope = scope.joins(:roles).where("roles.name LIKE ?", "%#{role}%") if role.present? @total_count = scope.size @members = paginate(scope)