USEFULL/gogs
1
0
Fork 0
mirror of https://github.com/gogs/gogs.git synced 2025-05-25 08:54:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

release: fix unable to edit release of a fork repository

Browse Source
This commit is contained in:
Unknwon 2017-02-23 11:35:33 -05:00
parent 162504e90c
commit 266c8f5a85
No known key found for this signature in database
GPG Key ID: 25B575AE3213B2B3
4 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/web.go
View File

@ -527,25 +527,9 @@ func runWeb(ctx *cli.Context) error {
m.Get("/new", repo.NewRelease) m.Get("/new", repo.NewRelease)
m.Post("/new", bindIgnErr(auth.NewReleaseForm{}), repo.NewReleasePost) m.Post("/new", bindIgnErr(auth.NewReleaseForm{}), repo.NewReleasePost)
m.Post("/delete", repo.DeleteRelease) m.Post("/delete", repo.DeleteRelease)
}, reqRepoWriter, context.RepoRef())
m.Group("/releases", func() {
m.Get("/edit/*", repo.EditRelease) m.Get("/edit/*", repo.EditRelease)
m.Post("/edit/*", bindIgnErr(auth.EditReleaseForm{}), repo.EditReleasePost) m.Post("/edit/*", bindIgnErr(auth.EditReleaseForm{}), repo.EditReleasePost)
}, reqRepoWriter, func(ctx *context.Context) { }, reqRepoWriter, context.RepoRef())
var err error
ctx.Repo.Commit, err = ctx.Repo.GitRepo.GetBranchCommit(ctx.Repo.Repository.DefaultBranch)
if err != nil {
ctx.Handle(500, "GetBranchCommit", err)
return
}
ctx.Repo.CommitsCount, err = ctx.Repo.Commit.CommitsCount()
if err != nil {
ctx.Handle(500, "CommitsCount", err)
return
}
ctx.Data["CommitsCount"] = ctx.Repo.CommitsCount
})
// FIXME: Should use ctx.Repo.PullRequest to unify template, currently we have inconsistent URL // FIXME: Should use ctx.Repo.PullRequest to unify template, currently we have inconsistent URL
// for PR in same repository. After select branch on the page, the URL contains redundant head user name. // for PR in same repository. After select branch on the page, the URL contains redundant head user name.

2
gogs.go
View File

@ -16,7 +16,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.9.166.0222 / 0.10 RC" const APP_VER = "0.9.166.0223 / 0.10 RC"
func init() { func init() {
setting.AppVer = APP_VER setting.AppVer = APP_VER

5
routers/repo/release.go
View File

@ -59,6 +59,7 @@ func Releases(ctx *context.Context) {
return return
} }
// FIXME: should only get releases match tags result and drafts.
releases, err := models.GetReleasesByRepoID(ctx.Repo.Repository.ID) releases, err := models.GetReleasesByRepoID(ctx.Repo.Repository.ID)
if err != nil { if err != nil {
ctx.Handle(500, "GetReleasesByRepoID", err) ctx.Handle(500, "GetReleasesByRepoID", err)
@ -72,7 +73,9 @@ func Releases(ctx *context.Context) {
tags := make([]*models.Release, len(tagsResult.Tags)) tags := make([]*models.Release, len(tagsResult.Tags))
for i, rawTag := range tagsResult.Tags { for i, rawTag := range tagsResult.Tags {
for j, r := range releases { for j, r := range releases {
if r == nil || (r.IsDraft && !ctx.Repo.IsOwner()) { if r == nil ||
(r.IsDraft && !ctx.Repo.IsOwner()) ||
(!r.IsDraft && r.TagName != rawTag) {
continue continue
} }
releases[j] = nil // Mark as used. releases[j] = nil // Mark as used.

2
templates/.VERSION
View File

@ -1 +1 @@
0.9.166.0222 / 0.10 RC 0.9.166.0223 / 0.10 RC