Merge branch 'develop' into standalone_develop
This commit is contained in:
commit
1894f00a2d
|
@ -1,7 +1,7 @@
|
||||||
class Api::V1::Projects::Actions::RunsController < Api::V1::Projects::Actions::BaseController
|
class Api::V1::Projects::Actions::RunsController < Api::V1::Projects::Actions::BaseController
|
||||||
|
|
||||||
def index
|
def index
|
||||||
@result_object = Api::V1::Projects::Actions::Runs::ListService.call(@project, params[:workflow], current_user&.gitea_token)
|
@result_object = Api::V1::Projects::Actions::Runs::ListService.call(@project, {workflow: params[:workflow], page: page, limit: limit}, current_user&.gitea_token)
|
||||||
end
|
end
|
||||||
|
|
||||||
def job_show
|
def job_show
|
||||||
|
|
|
@ -1,16 +1,18 @@
|
||||||
class Api::V1::Projects::Actions::Runs::ListService < ApplicationService
|
class Api::V1::Projects::Actions::Runs::ListService < ApplicationService
|
||||||
include ActiveModel::Model
|
include ActiveModel::Model
|
||||||
|
|
||||||
attr_reader :project, :token, :owner, :repo, :workflow
|
attr_reader :project, :token, :owner, :repo, :workflow, :page, :limit
|
||||||
attr_accessor :gitea_data
|
attr_accessor :gitea_data
|
||||||
|
|
||||||
validates :workflow, presence: true
|
validates :workflow, presence: true
|
||||||
|
|
||||||
def initialize(project, workflow, token =nil)
|
def initialize(project, params, token =nil)
|
||||||
@project = project
|
@project = project
|
||||||
@owner = project&.owner.login
|
@owner = project&.owner.login
|
||||||
@repo = project&.identifier
|
@repo = project&.identifier
|
||||||
@workflow = workflow
|
@workflow = params[:workflow]
|
||||||
|
@page = params[:page] || 1
|
||||||
|
@limit = params[:limit] || 15
|
||||||
@token = token
|
@token = token
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -25,7 +27,9 @@ class Api::V1::Projects::Actions::Runs::ListService < ApplicationService
|
||||||
def request_params
|
def request_params
|
||||||
{
|
{
|
||||||
access_token: token,
|
access_token: token,
|
||||||
workflow: workflow
|
workflow: workflow,
|
||||||
|
page: page,
|
||||||
|
limit: limit
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue