tdsds.com/gitea
tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-12-22 16:44:26 +00:00
Code Releases Activity

fix: render job title as commit message (#32748)

Browse Source 
resolves #32724

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
metiftikci 2024-12-08 06:23:09 +03:00 committed by GitHub
parent 1518f4ed12
commit ad994780af
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
routers/web/repo/actions/view.go
View File

@ -9,6 +9,7 @@ import (
"context" "context"
"errors" "errors"
"fmt" "fmt"
"html/template"
"io" "io"
"net/http" "net/http"
"net/url" "net/url"
@ -29,6 +30,7 @@ import (
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/storage" "code.gitea.io/gitea/modules/storage"
api "code.gitea.io/gitea/modules/structs" api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/templates"
"code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/modules/util"
"code.gitea.io/gitea/modules/web" "code.gitea.io/gitea/modules/web"
@ -87,19 +89,20 @@ type ViewResponse struct {
State struct { State struct {
Run struct { Run struct {
Link string `json:"link"` Link string `json:"link"`
Title string `json:"title"` Title string `json:"title"`
Status string `json:"status"` TitleHTML template.HTML `json:"titleHTML"`
CanCancel bool `json:"canCancel"` Status string `json:"status"`
CanApprove bool `json:"canApprove"` // the run needs an approval and the doer has permission to approve CanCancel bool `json:"canCancel"`
CanRerun bool `json:"canRerun"` CanApprove bool `json:"canApprove"` // the run needs an approval and the doer has permission to approve
CanDeleteArtifact bool `json:"canDeleteArtifact"` CanRerun bool `json:"canRerun"`
Done bool `json:"done"` CanDeleteArtifact bool `json:"canDeleteArtifact"`
WorkflowID string `json:"workflowID"` Done bool `json:"done"`
WorkflowLink string `json:"workflowLink"` WorkflowID string `json:"workflowID"`
IsSchedule bool `json:"isSchedule"` WorkflowLink string `json:"workflowLink"`
Jobs []*ViewJob `json:"jobs"` IsSchedule bool `json:"isSchedule"`
Commit ViewCommit `json:"commit"` Jobs []*ViewJob `json:"jobs"`
Commit ViewCommit `json:"commit"`
} `json:"run"` } `json:"run"`
CurrentJob struct { CurrentJob struct {
Title string `json:"title"` Title string `json:"title"`
@ -200,7 +203,10 @@ func ViewPost(ctx *context_module.Context) {
} }
} }
metas := ctx.Repo.Repository.ComposeMetas(ctx)
resp.State.Run.Title = run.Title resp.State.Run.Title = run.Title
resp.State.Run.TitleHTML = templates.NewRenderUtils(ctx).RenderCommitMessage(run.Title, metas)
resp.State.Run.Link = run.Link() resp.State.Run.Link = run.Link()
resp.State.Run.CanCancel = !run.Status.IsDone() && ctx.Repo.CanWrite(unit.TypeActions) resp.State.Run.CanCancel = !run.Status.IsDone() && ctx.Repo.CanWrite(unit.TypeActions)
resp.State.Run.CanApprove = run.NeedApproval && ctx.Repo.CanWrite(unit.TypeActions) resp.State.Run.CanApprove = run.NeedApproval && ctx.Repo.CanWrite(unit.TypeActions)

6
web_src/js/components/RepoActionView.vue
View File

@ -51,6 +51,7 @@ const sfc = {
run: { run: {
link: '', link: '',
title: '', title: '',
titleHTML: '',
status: '', status: '',
canCancel: false, canCancel: false,
canApprove: false, canApprove: false,
@ -383,9 +384,8 @@ export function initRepositoryActionView() {
<div class="action-info-summary"> <div class="action-info-summary">
<div class="action-info-summary-title"> <div class="action-info-summary-title">
<ActionRunStatus :locale-status="locale.status[run.status]" :status="run.status" :size="20"/> <ActionRunStatus :locale-status="locale.status[run.status]" :status="run.status" :size="20"/>
<h2 class="action-info-summary-title-text"> <!-- eslint-disable-next-line vue/no-v-html -->
{{ run.title }} <h2 class="action-info-summary-title-text" v-html="run.titleHTML"/>
</h2>
</div> </div>
<button class="ui basic small compact button primary" @click="approveRun()" v-if="run.canApprove"> <button class="ui basic small compact button primary" @click="approveRun()" v-if="run.canApprove">
{{ locale.approve }} {{ locale.approve }}