From 7c911f5b8610ad18e12c68016a8369442c43609a Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 6 Feb 2023 09:49:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E7=89=B9=E6=AE=8A=E7=AC=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/projects/branches_controller.rb | 4 ++-- app/controllers/api/v1/projects/tags_controller.rb | 2 +- app/services/api/v1/projects/tags/delete_service.rb | 2 +- config/routes/api.rb | 8 ++++++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/controllers/api/v1/projects/branches_controller.rb b/app/controllers/api/v1/projects/branches_controller.rb index 5d685a4a9..861bf9692 100644 --- a/app/controllers/api/v1/projects/branches_controller.rb +++ b/app/controllers/api/v1/projects/branches_controller.rb @@ -16,7 +16,7 @@ class Api::V1::Projects::BranchesController < Api::V1::BaseController end def destroy - @result_object = Api::V1::Projects::Branches::DeleteService.call(@project, params[:id], current_user&.gitea_token) + @result_object = Api::V1::Projects::Branches::DeleteService.call(@project, params[:name], current_user&.gitea_token) if @result_object return render_ok else @@ -27,7 +27,7 @@ class Api::V1::Projects::BranchesController < Api::V1::BaseController before_action :require_manager_above, only: [:update_default_branch] def update_default_branch - @result_object = Api::V1::Projects::Branches::UpdateDefaultBranchService.call(@project, params[:default_branch], current_user&.gitea_token) + @result_object = Api::V1::Projects::Branches::UpdateDefaultBranchService.call(@project, params[:name], current_user&.gitea_token) if @result_object return render_ok else diff --git a/app/controllers/api/v1/projects/tags_controller.rb b/app/controllers/api/v1/projects/tags_controller.rb index 9764225d4..ded55f888 100644 --- a/app/controllers/api/v1/projects/tags_controller.rb +++ b/app/controllers/api/v1/projects/tags_controller.rb @@ -8,7 +8,7 @@ class Api::V1::Projects::TagsController < Api::V1::BaseController before_action :require_operate_above, only: [:destroy] def destroy - @result_object = Api::V1::Projects::Tags::DeleteService.call(@project, params[:id], current_user&.gitea_token) + @result_object = Api::V1::Projects::Tags::DeleteService.call(@project, params[:name], current_user&.gitea_token) if @result_object return render_ok else diff --git a/app/services/api/v1/projects/tags/delete_service.rb b/app/services/api/v1/projects/tags/delete_service.rb index ee383a5bd..44c162259 100644 --- a/app/services/api/v1/projects/tags/delete_service.rb +++ b/app/services/api/v1/projects/tags/delete_service.rb @@ -17,7 +17,7 @@ class Api::V1::Projects::Tags::DeleteService < ApplicationService def call raise Error, errors.full_messages.join(",") unless valid? - check_tag_exist + # check_tag_exist excute_data_to_gitea true diff --git a/config/routes/api.rb b/config/routes/api.rb index 870861579..f86aae83e 100644 --- a/config/routes/api.rb +++ b/config/routes/api.rb @@ -46,13 +46,17 @@ defaults format: :json do get :hooktasks end end - resources :branches, only:[:index, :create, :destroy] do + resources :branches, param: :name, only:[:index, :create, :destroy] do collection do get :all patch :update_default_branch end end - resources :tags, only: [:index, :destroy] + match 'branches/*name', to: "branches#destroy", via: :all + + resources :tags, param: :name, only: [:index, :destroy] + match 'tags/*name', to: "tags#destroy", via: :all + resources :commits, only: [:index] resources :code_stats, only: [:index] get '/commits/:sha/diff', to: 'commits#diff'