add fork to orgs
This commit is contained in:
parent
bcab75e5d1
commit
1533e5e737
|
@ -2,18 +2,40 @@ class ForksController < ApplicationController
|
||||||
before_action :require_login
|
before_action :require_login
|
||||||
before_action :require_profile_completed, only: [:create]
|
before_action :require_profile_completed, only: [:create]
|
||||||
before_action :load_project
|
before_action :load_project
|
||||||
before_action :authenticate_project!, :authenticate_user!
|
before_action :authenticate_user!
|
||||||
|
before_action :authenticate_project!, only: [:create]
|
||||||
|
|
||||||
|
def fork_list
|
||||||
|
@user = current_user
|
||||||
|
@organizations = current_user.organizations
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
def create
|
def create
|
||||||
@new_project = Projects::ForkService.new(current_user, @project, params[:organization], params[:new_name], params[:new_identifier]).call
|
target_owner = if params[:organization].present? && @organization
|
||||||
|
@organization
|
||||||
|
else
|
||||||
|
current_user
|
||||||
|
end
|
||||||
|
@new_project = Projects::ForkService.new(target_owner, @project, params[:organization], params[:new_name], params[:new_identifier]).call
|
||||||
|
if @new_project == false
|
||||||
|
render_result(-1, "已fork过一次该项目,无法再次进行fork")
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
def authenticate_project!
|
def authenticate_project!
|
||||||
if current_user&.id == @project.user_id && (params[:new_identifier].blank? || params[:new_identifier] == @project.identifier)
|
if params[:organization].present?
|
||||||
render_result(-1, "自己不能fork自己的项目")
|
return render_forbidden('参数错误,当organization存在时不允许fork重命名') if params[:new_identifier].present? || params[:new_name].present?
|
||||||
elsif Project.exists?(user_id: current_user.id, identifier: (params[:new_identifier] || @project.identifier))
|
@organization = Organization.find_by(login:params[:organization])
|
||||||
render_result(0, "fork失败,你已拥有了这个项目")
|
return render_forbidden('仓库不存在') unless @organization.present?
|
||||||
|
return render_forbidden('你没有权限操作') unless @organization.is_admin?(current_user.id)
|
||||||
|
end
|
||||||
|
|
||||||
|
if params[:organization].blank? && Project.exists?(user_id: current_user.id, identifier: (params[:new_identifier] || @project.identifier))
|
||||||
|
render_result(-1, "fork失败,您已拥有了这个项目")
|
||||||
|
elsif @organization && Project.exists?(user_id: [@organization.id], identifier: (params[:new_identifier] || @project.identifier))
|
||||||
|
render_result(-1, "fork失败,组织已拥有了这个项目")
|
||||||
end
|
end
|
||||||
# return if current_user != @project.owner
|
# return if current_user != @project.owner
|
||||||
# render_result(-1, "自己不能fork自己的项目")
|
# render_result(-1, "自己不能fork自己的项目")
|
||||||
|
|
|
@ -18,7 +18,7 @@ class Projects::ForkService < ApplicationService
|
||||||
:license_id, :ignore_id, {repository: [:identifier, :hidden]}]
|
:license_id, :ignore_id, {repository: [:identifier, :hidden]}]
|
||||||
|
|
||||||
result = Gitea::Repository::ForkService.new(@project.owner, @target_owner, @project.identifier, @organization, @new_identifier).call
|
result = Gitea::Repository::ForkService.new(@project.owner, @target_owner, @project.identifier, @organization, @new_identifier).call
|
||||||
|
return false if result['clone_url'].nil?
|
||||||
clone_project.owner = @target_owner
|
clone_project.owner = @target_owner
|
||||||
clone_project.forked_from_project_id = @project.id
|
clone_project.forked_from_project_id = @project.id
|
||||||
clone_project.gpid = result['id']
|
clone_project.gpid = result['id']
|
||||||
|
|
|
@ -0,0 +1,16 @@
|
||||||
|
json.user do
|
||||||
|
json.id @user.id
|
||||||
|
json.type @user.type
|
||||||
|
json.name @user.real_name
|
||||||
|
json.login @user.login
|
||||||
|
json.image_url url_to_avatar(@user)
|
||||||
|
json.forked Project.exists?(user_id: @user.id, forked_from_project_id: @project.id)
|
||||||
|
end
|
||||||
|
json.organizations @organizations do |organization|
|
||||||
|
json.forked Project.exists?(user_id: organization.id, forked_from_project_id: @project.id)
|
||||||
|
json.id organization.id
|
||||||
|
json.name organization.login
|
||||||
|
json.nickname organization.nickname.blank? ? organization.name : organization.nickname
|
||||||
|
json.avatar_url url_to_avatar(organization)
|
||||||
|
json.created_at organization.created_on.strftime("%Y-%m-%d")
|
||||||
|
end
|
|
@ -625,7 +625,11 @@ Rails.application.routes.draw do
|
||||||
end
|
end
|
||||||
|
|
||||||
resources :hooks
|
resources :hooks
|
||||||
resources :forks, only: [:create]
|
resources :forks, only: [:create] do
|
||||||
|
collection do
|
||||||
|
get :fork_list
|
||||||
|
end
|
||||||
|
end
|
||||||
resources :project_trends, :path => :activity, only: [:index, :create]
|
resources :project_trends, :path => :activity, only: [:index, :create]
|
||||||
resources :issue_tags, :path => :labels, only: [:create, :edit, :update, :destroy, :index]
|
resources :issue_tags, :path => :labels, only: [:create, :edit, :update, :destroy, :index]
|
||||||
resources :version_releases, :path => :releases, only: [:index,:new, :show, :create, :edit, :update, :destroy]
|
resources :version_releases, :path => :releases, only: [:index,:new, :show, :create, :edit, :update, :destroy]
|
||||||
|
|
Loading…
Reference in New Issue