Update get branches api

This commit is contained in:
Jasder 2020-06-03 11:18:46 +08:00
parent f1cb2acc3b
commit 34984d12cb
6 changed files with 40 additions and 13 deletions

View File

@ -258,7 +258,7 @@ class IssuesController < ApplicationController
end end
end end
def clean def clean
issue_ids = params[:ids] issue_ids = params[:ids]
if issue_ids.present? if issue_ids.present?
if Issue.where(id: issue_ids).destroy_all if Issue.where(id: issue_ids).destroy_all
@ -266,13 +266,13 @@ class IssuesController < ApplicationController
else else
normal_status(-1, "删除失败") normal_status(-1, "删除失败")
end end
else else
normal_status(-1, "请选择任务") normal_status(-1, "请选择任务")
end end
end end
def series_update def series_update
update_hash = {} update_hash = {}
update_hash.merge!(assigned_to_id: params[:assigned_to_id]) if params[:assigned_to_id].present? update_hash.merge!(assigned_to_id: params[:assigned_to_id]) if params[:assigned_to_id].present?
update_hash.merge!(fixed_version_id: params[:fixed_version_id]) if params[:fixed_version_id].present? update_hash.merge!(fixed_version_id: params[:fixed_version_id]) if params[:fixed_version_id].present?
@ -287,7 +287,7 @@ class IssuesController < ApplicationController
else else
normal_status(-1, "批量更新失败") normal_status(-1, "批量更新失败")
end end
else else
normal_status(-1, "请选择任务") normal_status(-1, "请选择任务")
end end
end end
@ -428,7 +428,7 @@ class IssuesController < ApplicationController
def get_branches def get_branches
all_branches = [] all_branches = []
get_all_branches = Gitea::Repository::BranchesService.new(@user, @project&.repository.try(:identifier)).call get_all_branches = Gitea::Repository::Branches::ListService.new(@user, @project&.repository.try(:identifier)).call
if get_all_branches && get_all_branches.size > 0 if get_all_branches && get_all_branches.size > 0
get_all_branches.each do |b| get_all_branches.each do |b|
all_branches.push(b["name"]) all_branches.push(b["name"])

View File

@ -35,7 +35,7 @@ class ProjectsController < ApplicationController
end end
def branches def branches
@branches = Gitea::Repository::BranchesService.new(@project.owner, @project.identifier).call @branches = Gitea::Repository::Branches::ListService.new(@project.owner, @project.identifier).call
end end
def group_type_list def group_type_list
@ -94,8 +94,8 @@ class ProjectsController < ApplicationController
@praises = paginate(praises) @praises = paginate(praises)
end end
def fork_users def fork_users
fork_users = @project.fork_users.includes(:user, :project).order("fork_users.created_at asc").distinct fork_users = @project.fork_users.includes(:user, :project).order("fork_users.created_at asc").distinct
@forks_count = fork_users.size @forks_count = fork_users.size
@fork_users = paginate(fork_users) @fork_users = paginate(fork_users)
end end
@ -111,7 +111,7 @@ class ProjectsController < ApplicationController
:auth_password, :project_category_id, :project_language_id, :clone_addr, :private) :auth_password, :project_category_id, :project_language_id, :clone_addr, :private)
end end
def project_public? def project_public?
unless @project.is_public || current_user&admin? unless @project.is_public || current_user&admin?
tip_exception(403, "..") tip_exception(403, "..")
end end

View File

@ -25,7 +25,7 @@ class PullRequestsController < ApplicationController
def new def new
@all_branches = [] @all_branches = []
get_all_branches = Gitea::Repository::BranchesService.new(@user, @repository.try(:identifier)).call get_all_branches = Gitea::Repository::Branches::ListService.new(@user, @repository.try(:identifier)).call
if get_all_branches && get_all_branches.size > 0 if get_all_branches && get_all_branches.size > 0
get_all_branches.each do |b| get_all_branches.each do |b|
@all_branches.push(b["name"]) @all_branches.push(b["name"])

View File

@ -14,7 +14,7 @@ class VersionReleasesController < ApplicationController
def new def new
#获取所有的分支 #获取所有的分支
@all_branches = [] @all_branches = []
get_all_branches = Gitea::Repository::BranchesService.new(@user, @repository.try(:identifier)).call get_all_branches = Gitea::Repository::Branches::ListService.new(@user, @repository.try(:identifier)).call
if get_all_branches && get_all_branches.size > 0 if get_all_branches && get_all_branches.size > 0
get_all_branches.each do |b| get_all_branches.each do |b|
@all_branches.push(b["name"]) @all_branches.push(b["name"])

View File

@ -0,0 +1,27 @@
# Retrieve a specific branch from a repository, including its effective branch protection
class Gitea::Repository::Branches::GetService < Gitea::ClientService
attr_reader :owner, :repo, :branch, :token
# ex:
# Gitea::Repository::Branches::GetService.new(@project.owner, @project.identifier, 'master', current_user.gitea_token).call
def initialize(owner, repo, branch, token)
@owner = owner
@repo = repo
@branch = branch
@token = token
end
def call
response = get(url, params)
render_data(response)
end
private
def params
Hash.new.merge(token: token)
end
def url
"/repos/#{owner}/#{repo}/branches/#{branch}".freeze
end
end

View File

@ -1,4 +1,4 @@
class Gitea::Repository::BranchesService < Gitea::ClientService class Gitea::Repository::Branches::ListService < Gitea::ClientService
attr_reader :user, :repo attr_reader :user, :repo
def initialize(user, repo) def initialize(user, repo)