Fix topics saving internal error and disable for archived repos (#5821)

go-gitea · Jan 24, 2019 · cd83c2c · cd83c2c
1 parent ec31ee1
commit cd83c2c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/routers/routes/routes.go b/routers/routes/routes.go
@@ -652,7 +652,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 
  m.Group("/:username/:reponame", func() {
  m.Post("/topics", repo.TopicsPost)
- }, context.RepoMustNotBeArchived(), context.RepoAssignment(), reqRepoAdmin)
+ }, context.RepoAssignment(), context.RepoMustNotBeArchived(), reqRepoAdmin)
 
  m.Group("/:username/:reponame", func() {
  m.Group("", func() {

diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
@@ -25,9 +25,9 @@
  </div>
  <div class="ui repo-topic" id="repo-topic">
  {{range .Topics}}<a class="ui green basic label topic" style="cursor:pointer;" href="{{AppSubUrl}}/explore/repos?q={{.Name}}&topic=1">{{.Name}}</a>{{end}}
- {{if .Permission.IsAdmin}}<a id="manage_topic" style="cursor:pointer;margin-left:10px;">{{.i18n.Tr "repo.topic.manage_topics"}}</a>{{end}}
+ {{if and .Permission.IsAdmin (not .Repository.IsArchived)}}<a id="manage_topic" style="cursor:pointer;margin-left:10px;">{{.i18n.Tr "repo.topic.manage_topics"}}</a>{{end}}
  </div>
- {{if .Permission.IsAdmin}}
+ {{if and .Permission.IsAdmin (not .Repository.IsArchived)}}
  <div class="ui repo-topic-edit grid form segment error" id="topic_edit" style="display:none">
  <div class="fourteen wide column">
  <div class="field">