From ec1acde99ae5eb721288674eea8e55c15df5d883 Mon Sep 17 00:00:00 2001
From: viletyy <yystopf@163.com>
Date: Fri, 5 Feb 2021 15:06:13 +0800
Subject: [PATCH] [FIX]show teams, org name valid message

---
 app/controllers/organizations/teams_controller.rb | 8 ++++----
 app/models/organization.rb                        | 4 ++++
 config/locales/zh-CN.yml                          | 2 ++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/controllers/organizations/teams_controller.rb b/app/controllers/organizations/teams_controller.rb
index 47e95559f..5bc01fe39 100644
--- a/app/controllers/organizations/teams_controller.rb
+++ b/app/controllers/organizations/teams_controller.rb
@@ -4,11 +4,11 @@ class Organizations::TeamsController < Organizations::BaseController
   before_action :check_user_can_edit_org, only: [:create, :update, :destroy]
 
   def index
-    if @organization.is_owner?(current_user) || current_user.admin?
+    #if @organization.is_owner?(current_user) || current_user.admin?
       @teams = @organization.teams
-    else
-      @teams = @organization.teams.joins(:team_users).where(team_users: {user_id: current_user.id})
-    end
+    #else
+    #  @teams = @organization.teams.joins(:team_users).where(team_users: {user_id: current_user.id})
+    #end
     @is_admin = can_edit_org?
     @teams = @teams.includes(:team_units, :team_users)
 
diff --git a/app/models/organization.rb b/app/models/organization.rb
index 5c66c5ff4..a541b203f 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -59,6 +59,9 @@
 #
 
 class Organization < Owner
+  alias_attribute :name, :login
+  NAME_REGEX = /^(?!_)(?!.*?_$)[a-zA-Z0-9_-]+$/ #只含有数字、字母、下划线不能以下划线开头和结尾
+
   default_scope { where(type: "Organization") }
 
   has_one :organization_extension, dependent: :destroy
@@ -68,6 +71,7 @@ class Organization < Owner
 
   validates :login, presence: true
   validates_uniqueness_of :login, :if => Proc.new { |user| user.login_changed? && user.login.present? }, case_sensitive: false
+  validates :login, format: { with: NAME_REGEX, multiline: true, message: "只能含有数字、字母、下划线且不能以下划线开头和结尾" }
 
   delegate :description, :website, :location, :repo_admin_change_team_access,
            :visibility, :max_repo_creation, :num_projects, :num_users, :num_teams, to: :organization_extension, allow_nil: true
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index ab6601ed4..c040f9bd1 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -61,6 +61,8 @@ zh-CN:
     close_issue: 工单
   activerecord:
     attributes:
+      organization:
+        login: '组织名称'
       user:
         login: '登录名'
         lastname: '姓名'