From 55528950f1153174b643f03d98c0600d4e18022b Mon Sep 17 00:00:00 2001 From: viletyy Date: Thu, 4 Feb 2021 17:30:49 +0800 Subject: [PATCH] [FIX]owner text --- .../organizations/organization_users_controller.rb | 4 ++-- app/controllers/organizations/team_users_controller.rb | 4 ++-- app/services/organizations/create_service.rb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/organizations/organization_users_controller.rb b/app/controllers/organizations/organization_users_controller.rb index 0b2d9393c..8a7755a1b 100644 --- a/app/controllers/organizations/organization_users_controller.rb +++ b/app/controllers/organizations/organization_users_controller.rb @@ -11,7 +11,7 @@ class Organizations::OrganizationUsersController < Organizations::BaseController end def destroy - tip_exception("您不能从 Owner 团队中删除最后一个用户") if @organization.is_owner_team_last_one?(@operate_user.id) + tip_exception("您不能从所有者团队中删除最后一个用户") if @organization.is_owner_team_last_one?(@operate_user.id) ActiveRecord::Base.transaction do @organization_user.destroy! TeamUser.where(organization_id: @organization.id, user_id: @operate_user.id).map{|u| u.destroy!} @@ -26,7 +26,7 @@ class Organizations::OrganizationUsersController < Organizations::BaseController def quit @organization_user = @organization.organization_users.find_by(user_id: current_user.id) tip_exception("您不在该组织中") if @organization_user.nil? - tip_exception("您不能从 Owner 团队中删除最后一个用户") if @organization.is_owner_team_last_one?(current_user.id) + tip_exception("您不能从所有者团队中删除最后一个用户") if @organization.is_owner_team_last_one?(current_user.id) ActiveRecord::Base.transaction do @organization_user.destroy! TeamUser.where(organization_id: @organization.id, user_id: current_user.id).map{|u| u.destroy!} diff --git a/app/controllers/organizations/team_users_controller.rb b/app/controllers/organizations/team_users_controller.rb index a8e834423..d8694a6c5 100644 --- a/app/controllers/organizations/team_users_controller.rb +++ b/app/controllers/organizations/team_users_controller.rb @@ -25,7 +25,7 @@ class Organizations::TeamUsersController < Organizations::BaseController end def destroy - tip_exception("您不能从 Owner 团队中删除最后一个用户") if @team.owner? && @organization.is_owner_team_last_one?(@operate_user.id) + tip_exception("您不能从所有者团队中删除最后一个用户") if @team.owner? && @organization.is_owner_team_last_one?(@operate_user.id) ActiveRecord::Base.transaction do @team_user.destroy! Gitea::Organization::TeamUser::DeleteService.call(@organization.gitea_token, @team.gtid, @operate_user.login) @@ -39,7 +39,7 @@ class Organizations::TeamUsersController < Organizations::BaseController def quit @team_user = @team.team_users.find_by(user_id: current_user.id) tip_exception("您不在该组织团队中") if @team_user.nil? - tip_exception("您不能从 Owner 团队中删除最后一个用户") if @team.owner? && @organization.is_owner_team_last_one?(current_user.id) + tip_exception("您不能从所有者团队中删除最后一个用户") if @team.owner? && @organization.is_owner_team_last_one?(current_user.id) ActiveRecord::Base.transaction do @team_user.destroy! Gitea::Organization::TeamUser::DeleteService.call(@organization.gitea_token, @team.gtid, current_user.login) diff --git a/app/services/organizations/create_service.rb b/app/services/organizations/create_service.rb index c2ca0f431..218fa2115 100644 --- a/app/services/organizations/create_service.rb +++ b/app/services/organizations/create_service.rb @@ -54,7 +54,7 @@ class Organizations::CreateService < ApplicationService end def create_owner_info - @owner_team = Team.build(organization.id, "Owner", "", 4, true, true) + @owner_team = Team.build(organization.id, "Owners", "", 4, true, true) TeamUnit.unit_types.keys.each do |u_type| TeamUnit.build(organization.id, owner_team.id, u_type) end