From 53fe554d1e0547e77e67712295b69ae70955e5bb Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 17 Oct 2022 10:25:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E7=AE=A1=E7=90=86=E8=A1=A8=E5=A4=B4=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/stylesheets/admin.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss
index bae77fb29..b52f93702 100644
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@@ -204,4 +204,10 @@ input.form-control {
     color: #23272B;
     font-size: 1rem;
   }
+}
+
+.table th, .table td {
+  padding: 0.75rem 0.1rem;
+  vertical-align: top;
+  border-top: 1px solid #dee2e6;
 }
\ No newline at end of file

From 8d41c270448856034ae0591c5356268a36026189 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 17 Oct 2022 10:42:40 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=88=90=E5=91=98=E6=B7=BB=E5=8A=A0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/members_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index 5c8ed963e..92eb68f35 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -65,13 +65,13 @@ class MembersController < ApplicationController
 
   def check_member_exists!
     @current_user_header_team = Team.joins(:team_users, :team_projects).where(team_projects: {project_id: @project.id}, team_users: {user_id: current_user.id}).order(authorize: :desc).take
-    return render_error("user_id为#{params[:user_id]}的用户已经是项目成员") if member_exists? || (params[:user_id].to_i == current_user.id && @current_user_header_team.present?)
+    return render_error("#{@user&.nickname}已经是项目成员") if member_exists? || (params[:user_id].to_i == current_user.id && @current_user_header_team.present?)
   end
 
   def check_member_not_exists!
     @current_user_header_team = Team.joins(:team_users, :team_projects).where(team_projects: {project_id: @project.id}, team_users: {user_id: current_user.id}).order(authorize: :desc).take
     return render_error("用户为组织成员，请到组织下操作！") if (params[:user_id].to_i == current_user.id && @current_user_header_team.present?) && !member_exists?
-    return render_error("user_id为#{params[:user_id]}的用户还不是项目成员") unless member_exists?
+    return render_error("#{@user&.nickname}还不是项目成员") unless member_exists?
   end
 
   def check_user_profile_completed

From 8807be6e4d1e1c4e238467a8bb29996d9dd5d76f Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 17 Oct 2022 10:52:57 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E8=AF=AD=E8=A8=80=E6=96=B0=E5=A2=9E=E5=94=AF=E4=B8=80?=
 =?UTF-8?q?=E6=80=A7=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admins/project_languages_controller.rb | 7 ++++---
 app/models/project_language.rb                         | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admins/project_languages_controller.rb b/app/controllers/admins/project_languages_controller.rb
index 0f26f25bb..69594eb50 100644
--- a/app/controllers/admins/project_languages_controller.rb
+++ b/app/controllers/admins/project_languages_controller.rb
@@ -27,17 +27,18 @@ class Admins::ProjectLanguagesController < Admins::BaseController
       flash[:success] = '创建成功'
     else
       redirect_to admins_project_languages_path
-      flash[:danger] = '创建失败'
+      flash[:danger] = @project_language.errors.full_messages.join(",")
     end
   end
 
   def update 
-    if @project_language.update_attribute(:name, @name)
+    @project_language.attributes = {name: @name}
+    if @project_language.save
       redirect_to admins_project_languages_path
       flash[:success] = '更新成功'
     else 
       redirect_to admins_project_languages_path
-      flash[:success] = '更新失败'
+      flash[:danger] = @project_language.errors.full_messages.join(",")
     end
   end
 
diff --git a/app/models/project_language.rb b/app/models/project_language.rb
index ced6c5f9e..09b0b80f2 100644
--- a/app/models/project_language.rb
+++ b/app/models/project_language.rb
@@ -12,4 +12,6 @@
 
 class ProjectLanguage < ApplicationRecord
   include Projectable
+
+  validates :name, uniqueness: true
 end