Browse Source

edit dataset permission improvement

tags/v1.21.12.1
yan 5 years ago
parent
commit
affdcc0a87
3 changed files with 10 additions and 2 deletions
  1. +4
    -2
      routers/routes/routes.go
  2. +2
    -0
      templates/repo/datasets/dataset_list.tmpl
  3. +4
    -0
      templates/repo/datasets/index.tmpl

+ 4
- 2
routers/routes/routes.go View File

@@ -540,6 +540,8 @@ func RegisterRoutes(m *macaron.Macaron) {
reqRepoPullsReader := context.RequireRepoReader(models.UnitTypePullRequests)
reqRepoIssuesOrPullsWriter := context.RequireRepoWriterOr(models.UnitTypeIssues, models.UnitTypePullRequests)
reqRepoIssuesOrPullsReader := context.RequireRepoReaderOr(models.UnitTypeIssues, models.UnitTypePullRequests)
reqRepoDatasetReader := context.RequireRepoReader(models.UnitTypeDatasets)
reqRepoDatasetWriter := context.RequireRepoWriter(models.UnitTypeDatasets)

// ***** START: Organization *****
m.Group("/org", func() {
@@ -763,8 +765,8 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Post("/resolve_conversation", reqRepoIssuesOrPullsReader, repo.UpdateResolveConversation)
}, context.RepoMustNotBeArchived())
m.Group("/datasets", func() {
m.Get("", repo.DatasetIndex)
m.Post("", bindIgnErr(auth.EditDatasetForm{}), repo.EditDatasetPost)
m.Get("", reqRepoDatasetReader, repo.DatasetIndex)
m.Post("", reqRepoDatasetWriter, bindIgnErr(auth.EditDatasetForm{}), repo.EditDatasetPost)
}, context.RepoMustNotBeArchived())
m.Group("/comments/:id", func() {
m.Post("", repo.UpdateCommentContent)


+ 2
- 0
templates/repo/datasets/dataset_list.tmpl View File

@@ -26,9 +26,11 @@
</div>
</div>

{{if $.Permission.CanWrite $.UnitTypeDatasets}}
<div class="two wide column right aligned">
<a class="ui red button mini" href="javascript:void(0)" data-uuid={{.UUID}} data-dataset-delete data-remove-url="{{AppSubUrl}}/attachments/delete" data-csrf="{{$.CsrfToken}}">删除</a>
</div>
{{end}}
</div>
</div>
{{end}}


+ 4
- 0
templates/repo/datasets/index.tmpl View File

@@ -12,11 +12,13 @@
<span class="no-description text-italic">{{.dataset.Description}}</span>
</div>
</div>
{{if .Permission.CanWrite $.UnitTypeDatasets}}
<div class="column right aligned">
<a class="ui button primary" href="javascript:void(0)" id="dataset-edit">
{{.i18n.Tr "dataset.edit"}}
</a>
</div>
{{end}}
</div>

<div class="ui grid form segment success {{if not .Error}}hide{{end}}" id="dataset-content-edit">
@@ -63,9 +65,11 @@
</div>
<div class="dataset ui middle very relaxed page">
<div class="column">
{{if .Permission.CanWrite $.UnitTypeDatasets}}
<form class="ui form" action="{{.Link}}" method="post">
{{template "repo/datasets/dataset" .}}
</form>
{{end}}
</div>
</div>
</div>


Loading…
Cancel
Save