Procházet zdrojové kódy

issue_comment: fix pg syntax ambiguous (#4586)

Also handle error related to time parsing.
Unknwon před 7 roky
rodič
revize
8ed2330d6e
4 změnil soubory, kde provedl 16 přidání a 6 odebrání
  1. 1 1
      gogs.go
  2. 2 2
      models/comment.go
  3. 12 2
      routes/api/v1/repo/issue_comment.go
  4. 1 1
      templates/.VERSION

+ 1 - 1
gogs.go

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

+ 2 - 2
models/comment.go

@@ -437,9 +437,9 @@ func getCommentsByIssueIDSince(e Engine, issueID, since int64) ([]*Comment, erro
 
 func getCommentsByRepoIDSince(e Engine, repoID, since int64) ([]*Comment, error) {
 	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 {
-		sess.And("updated_unix >= ?", since)
+		sess.And("comment.updated_unix >= ?", since)
 	}
 	if err := sess.Find(&comments); err != nil {
 		return nil, err

+ 12 - 2
routes/api/v1/repo/issue_comment.go

@@ -15,7 +15,12 @@ import (
 func ListIssueComments(c *context.APIContext) {
 	var since time.Time
 	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)
@@ -41,7 +46,12 @@ func ListIssueComments(c *context.APIContext) {
 func ListRepoIssueComments(c *context.APIContext) {
 	var since time.Time
 	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())

+ 1 - 1
templates/.VERSION

@@ -1 +1 @@
-0.11.23.0625
+0.11.24.0627