From dab57e9af30281e0018dc80a20fd064de052eae8 Mon Sep 17 00:00:00 2001 From: viletyy Date: Wed, 20 Jan 2021 18:48:28 +0800 Subject: [PATCH] =?UTF-8?q?[FIX]=E4=B8=80=E4=BA=9B=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=88=9B=E5=BB=BA=E6=9C=80=E5=A4=A7=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=95=B0=E9=87=8F=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/organizations/team_projects_controller.rb | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/controllers/organizations/team_projects_controller.rb b/app/controllers/organizations/team_projects_controller.rb index 1af476b83..f221c98db 100644 --- a/app/controllers/organizations/team_projects_controller.rb +++ b/app/controllers/organizations/team_projects_controller.rb @@ -11,10 +11,7 @@ class Organizations::TeamProjectsController < Organizations::BaseController end def create -<<<<<<< HEAD tip_exception("该组织团队项目包括组织所有项目,不允许更改") if @team.includes_all_project -======= ->>>>>>> ceda008... [ADD]组织项目相关 ActiveRecord::Base.transaction do @team_project = TeamProject.build(@organization.id, @team.id, @operate_project.id) Gitea::Organization::TeamProject::CreateService.call(@organization.gitea_token, @team.gtid, @organization.login, @operate_project.identifier) @@ -50,11 +47,7 @@ class Organizations::TeamProjectsController < Organizations::BaseController end def load_operate_project -<<<<<<< HEAD @operate_project = Project.find_by(id: project_mark) || Project.find_by(identifier: project_mark) -======= - @operate_project = Project.find_by(name: params[:id]) || Project.find_by(identifier: params[:id]) ->>>>>>> ceda008... [ADD]组织项目相关 tip_exception("项目不存在") if @operate_project.nil? end