Fix topics saving internal error and disable for archived repos (#5821)
This commit is contained in:
parent
ec31ee1c1c
commit
cd83c2ca05
2 changed files with 3 additions and 3 deletions
|
@ -652,7 +652,7 @@ func RegisterRoutes(m *macaron.Macaron) {
|
||||||
|
|
||||||
m.Group("/:username/:reponame", func() {
|
m.Group("/:username/:reponame", func() {
|
||||||
m.Post("/topics", repo.TopicsPost)
|
m.Post("/topics", repo.TopicsPost)
|
||||||
}, context.RepoMustNotBeArchived(), context.RepoAssignment(), reqRepoAdmin)
|
}, context.RepoAssignment(), context.RepoMustNotBeArchived(), reqRepoAdmin)
|
||||||
|
|
||||||
m.Group("/:username/:reponame", func() {
|
m.Group("/:username/:reponame", func() {
|
||||||
m.Group("", func() {
|
m.Group("", func() {
|
||||||
|
|
|
@ -25,9 +25,9 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="ui repo-topic" id="repo-topic">
|
<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}}
|
{{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>
|
</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="ui repo-topic-edit grid form segment error" id="topic_edit" style="display:none">
|
||||||
<div class="fourteen wide column">
|
<div class="fourteen wide column">
|
||||||
<div class="field">
|
<div class="field">
|
||||||
|
|
Reference in a new issue