floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

[FIX]一些筛选以及创建最大项目数量验证

This commit is contained in:
viletyy 2021-01-20 18:48:28 +08:00
parent fef43caf4c
commit dab57e9af3
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/organizations/team_projects_controller.rb
View File

@ -11,10 +11,7 @@ class Organizations::TeamProjectsController < Organizations::BaseController
end end
def create def create
<<<<<<< HEAD
tip_exception("该组织团队项目包括组织所有项目,不允许更改") if @team.includes_all_project tip_exception("该组织团队项目包括组织所有项目,不允许更改") if @team.includes_all_project
=======
>>>>>>> ceda008... [ADD]组织项目相关
ActiveRecord::Base.transaction do ActiveRecord::Base.transaction do
@team_project = TeamProject.build(@organization.id, @team.id, @operate_project.id) @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) 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 end
def load_operate_project def load_operate_project
<<<<<<< HEAD
@operate_project = Project.find_by(id: project_mark) || Project.find_by(identifier: project_mark) @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? tip_exception("项目不存在") if @operate_project.nil?
end end