From fd6f904f7e5aed21ed4b1bc9dc8dfcd7535eeccc Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 20 Mar 2024 09:13:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=9C=80=E8=BF=91?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=88=97=E8=A1=A8message=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/projects/commits_controller.rb | 2 +- app/services/api/v1/projects/commits/recent_service.rb | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/api/v1/projects/commits_controller.rb b/app/controllers/api/v1/projects/commits_controller.rb index 9fd8de1c2..21987f4fb 100644 --- a/app/controllers/api/v1/projects/commits_controller.rb +++ b/app/controllers/api/v1/projects/commits_controller.rb @@ -11,6 +11,6 @@ class Api::V1::Projects::CommitsController < Api::V1::BaseController end def recent - @result_object = Api::V1::Projects::Commits::RecentService.call(@project, {page: page, limit: limit}, current_user&.gitea_token) + @result_object = Api::V1::Projects::Commits::RecentService.call(@project, {keyword: params[:keyword], page: page, limit: limit}, current_user&.gitea_token) end end \ No newline at end of file diff --git a/app/services/api/v1/projects/commits/recent_service.rb b/app/services/api/v1/projects/commits/recent_service.rb index fa4f65b43..9bc77dfc2 100644 --- a/app/services/api/v1/projects/commits/recent_service.rb +++ b/app/services/api/v1/projects/commits/recent_service.rb @@ -1,12 +1,13 @@ class Api::V1::Projects::Commits::RecentService < ApplicationService - attr_reader :project, :page, :limit, :owner, :repo, :token + attr_reader :project, :page, :limit, :keyword, :owner, :repo, :token attr_accessor :gitea_data def initialize(project, params, token=nil) @project = project @page = params[:page] || 1 @limit = params[:limit] || 15 + @keyword = params[:keyword] @owner = project&.owner&.login @repo = project&.identifier @token = token @@ -25,6 +26,7 @@ class Api::V1::Projects::Commits::RecentService < ApplicationService page: page, limit: limit } + param.merge!(keyword: keyword) if keyword.present? param end