Fix comment xorm

RedCocoon · RedCocoon · commit 0d804051f24b · 2024-11-07T22:53:15.000+08:00
diff --git a/models/conversations/comment.go b/models/conversations/comment.go
@@ -124,8 +124,8 @@ type ConversationComment struct {
 	Content        string `xorm:"LONGTEXT"`
 	ContentVersion int    `xorm:"NOT NULL DEFAULT 0"`
 
-	ConversationID int64 `xorm:"INDEX"`
-	Conversation   *Conversation
+	ConversationID int64         `xorm:"INDEX"`
+	Conversation   *Conversation `xorm:"-"`
 
 	CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
 	UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
diff --git a/models/conversations/conversation.go b/models/conversations/conversation.go
@@ -94,6 +94,9 @@ var ErrConversationAlreadyChanged = util.NewInvalidArgumentErrorf("the conversat
 
 type ConversationType int
 
+// CommentTypeUndefined is used to search for comments of any type
+const ConversationTypeUndefined CommentType = -1
+
 const (
 	ConversationTypeCommit ConversationType = iota
 )

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,9 @@ var ErrConversationAlreadyChanged = util.NewInvalidArgumentErrorf("the conversat`
`94`	`94`
`95`	`95`	`type ConversationType int`
`96`	`96`
	`97`	`+// CommentTypeUndefined is used to search for comments of any type`
	`98`	`+const ConversationTypeUndefined CommentType = -1`
	`99`	`+`
`97`	`100`	`const (`
`98`	`101`	`ConversationTypeCommit ConversationType = iota`
`99`	`102`	`)`