Browse Source

新增: 查询删除分支与普通分支

pull/347/head
yystopf 2 years ago
parent
commit
feec49d4bd
2 changed files with 5 additions and 3 deletions
  1. +1
    -1
      app/controllers/api/v1/projects/branches_controller.rb
  2. +4
    -2
      app/services/api/v1/projects/branches/list_service.rb

+ 1
- 1
app/controllers/api/v1/projects/branches_controller.rb View File

@@ -2,7 +2,7 @@ class Api::V1::Projects::BranchesController < Api::V1::BaseController
before_action :require_public_and_member_above, only: [:index, :all]

def index
@result_object = Api::V1::Projects::Branches::ListService.call(@project, {name: params[:keyword], page: page, limit: limit}, current_user&.gitea_token)
@result_object = Api::V1::Projects::Branches::ListService.call(@project, {name: params[:keyword], state: params[:state], page: page, limit: limit}, current_user&.gitea_token)
end

def all


+ 4
- 2
app/services/api/v1/projects/branches/list_service.rb View File

@@ -1,6 +1,6 @@
class Api::V1::Projects::Branches::ListService < ApplicationService

attr_accessor :project, :token, :owner, :repo, :name, :page, :limit
attr_accessor :project, :token, :owner, :repo, :name, :state, :page, :limit
attr_accessor :gitea_data, :gitea_repo_data

def initialize(project, params, token=nil)
@@ -9,6 +9,7 @@ class Api::V1::Projects::Branches::ListService < ApplicationService
@repo = project&.identifier
@token = token
@name = params[:name]
@state = params[:state]
@page = params[:page]
@limit = params[:limit]
end
@@ -29,7 +30,8 @@ class Api::V1::Projects::Branches::ListService < ApplicationService
limit: limit
}
params.merge!({name: name}) if name.present?

params.merge!({state: state}) if state.present?
params
end



Loading…
Cancel
Save