pub-solar/forgejo
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use relative url in actions view (#22675)

Browse source 
Use relative url in actions view.
This commit is contained in:
Jason Song 2023-02-01 06:46:10 +08:00 committed by GitHub
parent 707ecec715
commit b6145bfaa3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
routers/web/repo/actions/view.go
View file

@ -49,7 +49,7 @@ type ViewRequest struct {
type ViewResponse struct { type ViewResponse struct {
State struct { State struct {
Run struct { Run struct {
HTMLURL string `json:"htmlurl"` Link string `json:"link"`
Title string `json:"title"` Title string `json:"title"`
CanCancel bool `json:"canCancel"` CanCancel bool `json:"canCancel"`
Done bool `json:"done"` Done bool `json:"done"`
@ -105,7 +105,7 @@ func ViewPost(ctx *context_module.Context) {
resp := &ViewResponse{} resp := &ViewResponse{}
resp.State.Run.Title = run.Title resp.State.Run.Title = run.Title
resp.State.Run.HTMLURL = run.HTMLURL() 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.Done = run.Status.IsDone() resp.State.Run.Done = run.Status.IsDone()
resp.State.Run.Jobs = make([]*ViewJob, 0, len(jobs)) // marshal to '[]' instead fo 'null' in json resp.State.Run.Jobs = make([]*ViewJob, 0, len(jobs)) // marshal to '[]' instead fo 'null' in json

8
web_src/js/components/RepoActionView.vue
View file

@ -12,7 +12,7 @@
<div class="action-view-left"> <div class="action-view-left">
<div class="job-group-section"> <div class="job-group-section">
<div class="job-brief-list"> <div class="job-brief-list">
<a class="job-brief-item" v-for="(job, index) in run.jobs" :key="job.id" :href="run.htmlurl+'/jobs/'+index"> <a class="job-brief-item" v-for="(job, index) in run.jobs" :key="job.id" :href="run.link+'/jobs/'+index">
<SvgIcon name="octicon-check-circle-fill" class="green" v-if="job.status === 'success'"/> <SvgIcon name="octicon-check-circle-fill" class="green" v-if="job.status === 'success'"/>
<SvgIcon name="octicon-skip" class="ui text grey" v-else-if="job.status === 'skipped'"/> <SvgIcon name="octicon-skip" class="ui text grey" v-else-if="job.status === 'skipped'"/>
<SvgIcon name="octicon-clock" class="ui text yellow" v-else-if="job.status === 'waiting'"/> <SvgIcon name="octicon-clock" class="ui text yellow" v-else-if="job.status === 'waiting'"/>
@ -92,7 +92,7 @@ const sfc = {
// provided by backend // provided by backend
run: { run: {
htmlurl: '', link: '',
title: '', title: '',
canCancel: false, canCancel: false,
done: false, done: false,
@ -163,11 +163,11 @@ const sfc = {
}, },
// rerun a job // rerun a job
rerunJob(idx) { rerunJob(idx) {
this.fetch(`${this.run.htmlurl}/jobs/${idx}/rerun`); this.fetch(`${this.run.link}/jobs/${idx}/rerun`);
}, },
// cancel a run // cancel a run
cancelRun() { cancelRun() {
this.fetch(`${this.run.htmlurl}/cancel`); this.fetch(`${this.run.link}/cancel`);
}, },
createLogLine(line) { createLogLine(line) {