diff options
| author | yp05327 <576951401@qq.com> | 2023-03-12 22:36:47 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-12 14:36:47 +0100 |
| commit | a04eeb2a548d4fd2b63873fc2acff49c52e19723 (patch) | |
| tree | e4536fc0c417db5e56e3d60f0dce384e1b299fb1 | |
| parent | e72290fd9aeb77a47311483d1d565e428ce40cd9 (diff) | |
| download | gitea-a04eeb2a548d4fd2b63873fc2acff49c52e19723.tar.gz gitea-a04eeb2a548d4fd2b63873fc2acff49c52e19723.zip | |
Show edit/close/delete button on organization wide repositories (#23388)
A part of https://github.com/go-gitea/gitea/pull/22865
| -rw-r--r-- | routers/web/repo/projects.go | 2 | ||||
| -rw-r--r-- | templates/projects/list.tmpl | 6 | ||||
| -rw-r--r-- | templates/projects/view.tmpl | 4 | ||||
| -rw-r--r-- | templates/repo/projects/list.tmpl | 12 |
4 files changed, 12 insertions, 12 deletions
diff --git a/routers/web/repo/projects.go b/routers/web/repo/projects.go index 29bd59c7a3..e15f548a38 100644 --- a/routers/web/repo/projects.go +++ b/routers/web/repo/projects.go @@ -113,7 +113,7 @@ func Projects(ctx *context.Context) { pager.AddParam(ctx, "state", "State") ctx.Data["Page"] = pager - ctx.Data["CanWriteProjects"] = true + ctx.Data["CanWriteProjects"] = ctx.Repo.Permission.CanWrite(unit.TypeProjects) ctx.Data["IsShowClosed"] = isShowClosed ctx.Data["IsProjectsPage"] = true ctx.Data["SortType"] = sortType diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index 489189ec45..4a21c0fd28 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -51,7 +51,7 @@ {{JsPrettyNumber .NumClosedIssues}} {{$.locale.Tr "repo.issues.closed_title"}} </span> </div> - {{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}} + {{if and $.CanWriteProjects (not $.Repository.IsArchived)}} <div class="ui right operate"> <a href="{{$.Link}}/{{.ID}}/edit" data-id={{.ID}} data-title={{.Title}}>{{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}}</a> {{if .IsClosed}} @@ -59,7 +59,7 @@ {{else}} <a class="link-action" href data-url="{{$.Link}}/{{.ID}}/close">{{svg "octicon-skip"}} {{$.locale.Tr "repo.projects.close"}}</a> {{end}} - <a class="delete-button" href="#" data-url="{{$.RepoLink}}/projects/{{.ID}}/delete" data-id="{{.ID}}">{{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}}</a> + <a class="delete-button" href="#" data-url="{{$.Link}}/{{.ID}}/delete" data-id="{{.ID}}">{{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}}</a> </div> {{end}} {{if .Description}} @@ -75,7 +75,7 @@ </div> </div> -{{if or .CanWriteIssues .CanWritePulls}} +{{if $.CanWriteProjects}} <div class="ui small basic delete modal"> <div class="ui icon header"> {{svg "octicon-trash"}} diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index 06192f630b..6867309510 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -43,7 +43,7 @@ <h2 class="project-title">{{$.Project.Title}}</h2> <div class="content project-description">{{$.Project.RenderedContent|Str2html}}</div> </div> - {{if or $.CanWriteIssues $.CanWritePulls}} + {{if $.CanWriteProjects}} <div class="column right aligned"> <div class="ui compact right small menu"> <a class="item" href="{{$.Link}}/edit?redirect=project" data-id={{$.Project.ID}} data-title={{$.Project.Title}}> @@ -256,7 +256,7 @@ </div> -{{if or .CanWriteIssues .CanWritePulls}} +{{if .CanWriteProjects}} <div class="ui small basic delete modal"> <div class="ui icon header"> {{svg "octicon-trash"}} diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl index 929a1b4c6f..f066f84ea2 100644 --- a/templates/repo/projects/list.tmpl +++ b/templates/repo/projects/list.tmpl @@ -53,15 +53,15 @@ {{JsPrettyNumber .NumClosedIssues}} {{$.locale.Tr "repo.issues.closed_title"}} </span> </div> - {{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}} + {{if and $.CanWriteProjects (not $.Repository.IsArchived)}} <div class="ui right operate"> - <a href="{{$.Link}}/{{.ID}}/edit" data-id={{.ID}} data-title={{.Title}}>{{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}}</a> + <a href="{{.Link}}/edit" data-id={{.ID}} data-title={{.Title}}>{{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}}</a> {{if .IsClosed}} - <a class="link-action" href data-url="{{$.Link}}/{{.ID}}/open">{{svg "octicon-check"}} {{$.locale.Tr "repo.projects.open"}}</a> + <a class="link-action" href data-url="{{.Link}}/open">{{svg "octicon-check"}} {{$.locale.Tr "repo.projects.open"}}</a> {{else}} - <a class="link-action" href data-url="{{$.Link}}/{{.ID}}/close">{{svg "octicon-skip"}} {{$.locale.Tr "repo.projects.close"}}</a> + <a class="link-action" href data-url="{{.Link}}/close">{{svg "octicon-skip"}} {{$.locale.Tr "repo.projects.close"}}</a> {{end}} - <a class="delete-button" href="#" data-url="{{$.RepoLink}}/projects/{{.ID}}/delete" data-id="{{.ID}}">{{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}}</a> + <a class="delete-button" href="#" data-url="{{.Link}}/delete" data-id="{{.ID}}">{{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}}</a> </div> {{end}} {{if .Description}} @@ -77,7 +77,7 @@ </div> </div> -{{if or .CanWriteIssues .CanWritePulls}} +{{if .CanWriteProjects}} <div class="ui small basic delete modal"> <div class="ui icon header"> {{svg "octicon-trash"}} |