third_party
/
gitea
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix #1407

Browse Source
tokarchuk/v1.17
Unknwon 9 years ago
parent 72377c721c
commit 869113704b
3 changed files with 20 additions and 20 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      gogs.go
  2. 36
      routers/repo/issue.go
  3. 2
      templates/.VERSION

2
gogs.go
Unescape View File

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.6.3.0728 Beta" const APP_VER = "0.6.3.0730 Beta"
func init() { func init() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())

36
routers/repo/issue.go
Unescape View File

@ -975,7 +975,7 @@ func Milestones(ctx *middleware.Context) {
miles, err := models.GetMilestones(ctx.Repo.Repository.Id, isShowClosed) miles, err := models.GetMilestones(ctx.Repo.Repository.Id, isShowClosed)
if err != nil { if err != nil {
ctx.Handle(500, "issue.Milestones(GetMilestones)", err) ctx.Handle(500, "GetMilestones", err)
return return
} }
for _, m := range miles { for _, m := range miles {
@ -1016,7 +1016,7 @@ func NewMilestonePost(ctx *middleware.Context, form auth.CreateMilestoneForm) {
} }
deadline, err = time.Parse("01/02/2006", form.Deadline) deadline, err = time.Parse("01/02/2006", form.Deadline)
if err != nil { if err != nil {
ctx.Handle(500, "issue.NewMilestonePost(time.Parse)", err) ctx.Handle(500, "time.Parse", err)
return return
} }
@ -1028,11 +1028,11 @@ func NewMilestonePost(ctx *middleware.Context, form auth.CreateMilestoneForm) {
Deadline: deadline, Deadline: deadline,
} }
if err = models.NewMilestone(mile); err != nil { if err = models.NewMilestone(mile); err != nil {
ctx.Handle(500, "issue.NewMilestonePost(NewMilestone)", err) ctx.Handle(500, "NewMilestone", err)
return return
} }
ctx.Redirect(ctx.Repo.RepoLink + "/issues/milestones") ctx.Redirect(ctx.Repo.RepoLink + "/milestones")
} }
func UpdateMilestone(ctx *middleware.Context) { func UpdateMilestone(ctx *middleware.Context) {
@ -1040,7 +1040,7 @@ func UpdateMilestone(ctx *middleware.Context) {
ctx.Data["IsRepoToolbarIssues"] = true ctx.Data["IsRepoToolbarIssues"] = true
ctx.Data["IsRepoToolbarIssuesList"] = true ctx.Data["IsRepoToolbarIssuesList"] = true
idx := com.StrTo(ctx.Params(":index")).MustInt64() idx := ctx.ParamsInt64(":index")
if idx == 0 { if idx == 0 {
ctx.Handle(404, "issue.UpdateMilestone", nil) ctx.Handle(404, "issue.UpdateMilestone", nil)
return return
@ -1049,9 +1049,9 @@ func UpdateMilestone(ctx *middleware.Context) {
mile, err := models.GetMilestoneByIndex(ctx.Repo.Repository.Id, idx) mile, err := models.GetMilestoneByIndex(ctx.Repo.Repository.Id, idx)
if err != nil { if err != nil {
if err == models.ErrMilestoneNotExist { if err == models.ErrMilestoneNotExist {
ctx.Handle(404, "issue.UpdateMilestone(GetMilestoneByIndex)", err) ctx.Handle(404, "GetMilestoneByIndex", err)
} else { } else {
ctx.Handle(500, "issue.UpdateMilestone(GetMilestoneByIndex)", err) ctx.Handle(500, "GetMilestoneByIndex", err)
} }
return return
} }
@ -1062,7 +1062,7 @@ func UpdateMilestone(ctx *middleware.Context) {
case "open": case "open":
if mile.IsClosed { if mile.IsClosed {
if err = models.ChangeMilestoneStatus(mile, false); err != nil { if err = models.ChangeMilestoneStatus(mile, false); err != nil {
ctx.Handle(500, "issue.UpdateMilestone(ChangeMilestoneStatus)", err) ctx.Handle(500, "ChangeMilestoneStatus", err)
return return
} }
} }
@ -1070,17 +1070,17 @@ func UpdateMilestone(ctx *middleware.Context) {
if !mile.IsClosed { if !mile.IsClosed {
mile.ClosedDate = time.Now() mile.ClosedDate = time.Now()
if err = models.ChangeMilestoneStatus(mile, true); err != nil { if err = models.ChangeMilestoneStatus(mile, true); err != nil {
ctx.Handle(500, "issue.UpdateMilestone(ChangeMilestoneStatus)", err) ctx.Handle(500, "ChangeMilestoneStatus", err)
return return
} }
} }
case "delete": case "delete":
if err = models.DeleteMilestone(mile); err != nil { if err = models.DeleteMilestone(mile); err != nil {
ctx.Handle(500, "issue.UpdateMilestone(DeleteMilestone)", err) ctx.Handle(500, "DeleteMilestone", err)
return return
} }
} }
ctx.Redirect(ctx.Repo.RepoLink + "/issues/milestones") ctx.Redirect(ctx.Repo.RepoLink + "/milestones")
return return
} }
@ -1098,7 +1098,7 @@ func UpdateMilestonePost(ctx *middleware.Context, form auth.CreateMilestoneForm)
ctx.Data["IsRepoToolbarIssues"] = true ctx.Data["IsRepoToolbarIssues"] = true
ctx.Data["IsRepoToolbarIssuesList"] = true ctx.Data["IsRepoToolbarIssuesList"] = true
idx := com.StrTo(ctx.Params(":index")).MustInt64() idx := ctx.ParamsInt64(":index")
if idx == 0 { if idx == 0 {
ctx.Handle(404, "issue.UpdateMilestonePost", nil) ctx.Handle(404, "issue.UpdateMilestonePost", nil)
return return
@ -1107,9 +1107,9 @@ func UpdateMilestonePost(ctx *middleware.Context, form auth.CreateMilestoneForm)
mile, err := models.GetMilestoneByIndex(ctx.Repo.Repository.Id, idx) mile, err := models.GetMilestoneByIndex(ctx.Repo.Repository.Id, idx)
if err != nil { if err != nil {
if err == models.ErrMilestoneNotExist { if err == models.ErrMilestoneNotExist {
ctx.Handle(404, "issue.UpdateMilestonePost(GetMilestoneByIndex)", err) ctx.Handle(404, "GetMilestoneByIndex", err)
} else { } else {
ctx.Handle(500, "issue.UpdateMilestonePost(GetMilestoneByIndex)", err) ctx.Handle(500, "GetMilestoneByIndex", err)
} }
return return
} }
@ -1125,7 +1125,7 @@ func UpdateMilestonePost(ctx *middleware.Context, form auth.CreateMilestoneForm)
} }
deadline, err = time.Parse("01/02/2006", form.Deadline) deadline, err = time.Parse("01/02/2006", form.Deadline)
if err != nil { if err != nil {
ctx.Handle(500, "issue.UpdateMilestonePost(time.Parse)", err) ctx.Handle(500, "time.Parse", err)
return return
} }
@ -1133,11 +1133,11 @@ func UpdateMilestonePost(ctx *middleware.Context, form auth.CreateMilestoneForm)
mile.Content = form.Content mile.Content = form.Content
mile.Deadline = deadline mile.Deadline = deadline
if err = models.UpdateMilestone(mile); err != nil { if err = models.UpdateMilestone(mile); err != nil {
ctx.Handle(500, "issue.UpdateMilestonePost(UpdateMilestone)", err) ctx.Handle(500, "UpdateMilestone", err)
return return
} }
ctx.Redirect(ctx.Repo.RepoLink + "/issues/milestones") ctx.Redirect(ctx.Repo.RepoLink + "/milestones")
} }
func IssueGetAttachment(ctx *middleware.Context) { func IssueGetAttachment(ctx *middleware.Context) {
@ -1150,7 +1150,7 @@ func IssueGetAttachment(ctx *middleware.Context) {
attachment, err := models.GetAttachmentById(id) attachment, err := models.GetAttachmentById(id)
if err != nil { if err != nil {
ctx.Handle(404, "issue.IssueGetAttachment(models.GetAttachmentById)", err) ctx.Handle(404, "models.GetAttachmentById", err)
return return
} }

2
templates/.VERSION
Unescape View File

@ -1 +1 @@
0.6.3.0728 Beta 0.6.3.0730 Beta
Write Preview
Loading…
Cancel
Save