USEFULL
/
gogs
mirror of https://github.com/gogs/gogs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

issue_comment: fix pg syntax ambiguous (#4586) 

Also handle error related to time parsing.
pull/4590/merge
Unknwon 2017-06-27 20:21:36 -04:00
parent 261237745f
commit 8ed2330d6e
No known key found for this signature in database
GPG Key ID: 7A02C406FAC875A2
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gogs.go
View File

@ -16,7 +16,7 @@ import (
"github.com/gogits/gogs/pkg/setting" "github.com/gogits/gogs/pkg/setting"
) )
const APP_VER = "0.11.23.0625" const APP_VER = "0.11.24.0627"
func init() { func init() {
setting.AppVer = APP_VER setting.AppVer = APP_VER

4
models/comment.go
View File

@ -437,9 +437,9 @@ func getCommentsByIssueIDSince(e Engine, issueID, since int64) ([]*Comment, erro
func getCommentsByRepoIDSince(e Engine, repoID, since int64) ([]*Comment, error) { func getCommentsByRepoIDSince(e Engine, repoID, since int64) ([]*Comment, error) {
comments := make([]*Comment, 0, 10) comments := make([]*Comment, 0, 10)
sess := e.Where("issue.repo_id = ?", repoID).Join("INNER", "issue", "issue.id = comment.issue_id", repoID).Asc("created_unix") sess := e.Where("issue.repo_id = ?", repoID).Join("INNER", "issue", "issue.id = comment.issue_id", repoID).Asc("comment.created_unix")
if since > 0 { if since > 0 {
sess.And("updated_unix >= ?", since) sess.And("comment.updated_unix >= ?", since)
} }
if err := sess.Find(&comments); err != nil { if err := sess.Find(&comments); err != nil {
return nil, err return nil, err

14
routes/api/v1/repo/issue_comment.go
View File

@ -15,7 +15,12 @@ import (
func ListIssueComments(c *context.APIContext) { func ListIssueComments(c *context.APIContext) {
var since time.Time var since time.Time
if len(c.Query("since")) > 0 { if len(c.Query("since")) > 0 {
since, _ = time.Parse(time.RFC3339, c.Query("since")) var err error
since, err = time.Parse(time.RFC3339, c.Query("since"))
if err != nil {
c.Error(422, "", err)
return
}
} }
// comments,err:=models.GetCommentsByIssueIDSince(, since) // comments,err:=models.GetCommentsByIssueIDSince(, since)
@ -41,7 +46,12 @@ func ListIssueComments(c *context.APIContext) {
func ListRepoIssueComments(c *context.APIContext) { func ListRepoIssueComments(c *context.APIContext) {
var since time.Time var since time.Time
if len(c.Query("since")) > 0 { if len(c.Query("since")) > 0 {
since, _ = time.Parse(time.RFC3339, c.Query("since")) var err error
since, err = time.Parse(time.RFC3339, c.Query("since"))
if err != nil {
c.Error(422, "", err)
return
}
} }
comments, err := models.GetCommentsByRepoIDSince(c.Repo.Repository.ID, since.Unix()) comments, err := models.GetCommentsByRepoIDSince(c.Repo.Repository.ID, since.Unix())

2
templates/.VERSION
View File

@ -1 +1 @@
0.11.23.0625 0.11.24.0627