Show edit/close/delete button on organization wide repositories (#23388)

A part of #22865
go-gitea · Mar 12, 2023 · a04eeb2 · a04eeb2
1 parent e72290f
commit a04eeb2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -51,15 +51,15 @@
  {{JsPrettyNumber .NumClosedIssues}}&nbsp;{{$.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}}
  <a class="link-action" href data-url="{{$.Link}}/{{.ID}}/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>
  {{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
@@ -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
@@ -53,15 +53,15 @@
  {{JsPrettyNumber .NumClosedIssues}}&nbsp;{{$.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"}}