Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	app/controllers/members_controller.rb

app/assets/stylesheets/admin.scss

@@ -205,3 +205,9 @@ input.form-control {
     font-size: 1rem;
   }
 }
+
+.table th, .table td {
+  padding: 0.75rem 0.1rem;
+  vertical-align: top;
+  border-top: 1px solid #dee2e6;
+}

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
 

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.find_by(id: params[:user_id]).try(:login)}已经是项目成员") 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.find_by(id: params[:user_id]).try(:login)}还不是项目成员") unless member_exists?
+    return render_error("#{@user&.nickname}还不是项目成员") unless member_exists?
   end
 
   def check_user_profile_completed

app/models/project_language.rb

@@ -12,4 +12,6 @@
 
 class ProjectLanguage < ApplicationRecord
   include Projectable
+
+  validates :name, uniqueness: true
 end