A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.
fix: permalink error on some pages
sy-records3e76a0368ff5
diff --git a/docs/docs.go b/docs/docs.goindex 2b2e1d70..897fcd66 100644--- a/docs/docs.go+++ b/docs/docs.go@@ -3685,6 +3685,49 @@ const docTemplate = `{}}},+ "/answer/api/v1/plugin/status": {+ "get": {+ "security": [+ {+ "ApiKeyAuth": []+ }+ ],+ "description": "get all plugins status",+ "consumes": [+ "application/json"+ ],+ "produces": [+ "application/json"+ ],+ "tags": [+ "Plugin"+ ],+ "summary": "get all plugins status",+ "responses": {+ "200": {+ "description": "OK",+ "schema": {+ "allOf": [+ {+ "$ref": "#/definitions/handler.RespBody"+ },+ {+ "type": "object",+ "properties": {+ "data": {+ "type": "array",+ "items": {+ "$ref": "#/definitions/schema.GetPluginListResp"+ }+ }+ }+ }+ ]+ }+ }+ }+ }+ },"/answer/api/v1/post/render": {"post": {"security": [@@ -7278,6 +7321,10 @@ const docTemplate = `{"description": "username","type": "string"},+ "visit_token": {+ "description": "visit token",+ "type": "string"+ },"website": {"description": "website","type": "string"@@ -7679,27 +7726,21 @@ const docTemplate = `{"type": "object","properties": {"created_at": {- "description": "created time","type": "integer"},"description": {- "description": "description text","type": "string"},"display_name": {- "description": "display name","type": "string"},"excerpt": {- "description": "excerpt","type": "string"},"follow_count": {- "description": "follower amount","type": "integer"},"is_follower": {- "description": "is follower","type": "boolean"},"main_tag_slug_name": {@@ -7707,22 +7748,18 @@ const docTemplate = `{"type": "string"},"member_actions": {- "description": "MemberActions","type": "array","items": {"$ref": "#/definitions/schema.PermissionMemberAction"}},"original_text": {- "description": "original text","type": "string"},"parsed_text": {- "description": "parsed text","type": "string"},"question_count": {- "description": "question amount","type": "integer"},"recommend": {@@ -7732,15 +7769,15 @@ const docTemplate = `{"type": "boolean"},"slug_name": {- "description": "slug name",+ "type": "string"+ },+ "status": {"type": "string"},"tag_id": {- "description": "tag id","type": "string"},"updated_at": {- "description": "updated time","type": "integer"}}@@ -8491,6 +8528,9 @@ const docTemplate = `{"title": {"type": "string"},+ "url_title": {+ "type": "string"+ },"user_info": {"description": "user info","allOf": [@@ -9640,6 +9680,10 @@ const docTemplate = `{"description": "username","type": "string"},+ "visit_token": {+ "description": "visit token",+ "type": "string"+ },"website": {"description": "website","type": "string"diff --git a/docs/swagger.json b/docs/swagger.jsonindex c4426944..48b6283e 100644--- a/docs/swagger.json+++ b/docs/swagger.json@@ -3654,6 +3654,49 @@}}},+ "/answer/api/v1/plugin/status": {+ "get": {+ "security": [+ {+ "ApiKeyAuth": []+ }+ ],+ "description": "get all plugins status",+ "consumes": [+ "application/json"+ ],+ "produces": [+ "application/json"+ ],+ "tags": [+ "Plugin"+ ],+ "summary": "get all plugins status",+ "responses": {+ "200": {+ "description": "OK",+ "schema": {+ "allOf": [+ {+ "$ref": "#/definitions/handler.RespBody"+ },+ {+ "type": "object",+ "properties": {+ "data": {+ "type": "array",+ "items": {+ "$ref": "#/definitions/schema.GetPluginListResp"+ }+ }+ }+ }+ ]+ }+ }+ }+ }+ },"/answer/api/v1/post/render": {"post": {"security": [@@ -7247,6 +7290,10 @@"description": "username","type": "string"},+ "visit_token": {+ "description": "visit token",+ "type": "string"+ },"website": {"description": "website","type": "string"@@ -7648,27 +7695,21 @@"type": "object","properties": {"created_at": {- "description": "created time","type": "integer"},"description": {- "description": "description text","type": "string"},"display_name": {- "description": "display name","type": "string"},"excerpt": {- "description": "excerpt","type": "string"},"follow_count": {- "description": "follower amount","type": "integer"},"is_follower": {- "description": "is follower","type": "boolean"},"main_tag_slug_name": {@@ -7676,22 +7717,18 @@"type": "string"},"member_actions": {- "description": "MemberActions","type": "array","items": {"$ref": "#/definitions/schema.PermissionMemberAction"}},"original_text": {- "description": "original text","type": "string"},"parsed_text": {- "description": "parsed text","type": "string"},"question_count": {- "description": "question amount","type": "integer"},"recommend": {@@ -7701,15 +7738,15 @@"type": "boolean"},"slug_name": {- "description": "slug name",+ "type": "string"+ },+ "status": {"type": "string"},"tag_id": {- "description": "tag id","type": "string"},"updated_at": {- "description": "updated time","type": "integer"}}@@ -8460,6 +8497,9 @@"title": {"type": "string"},+ "url_title": {+ "type": "string"+ },"user_info": {"description": "user info","allOf": [@@ -9609,6 +9649,10 @@"description": "username","type": "string"},+ "visit_token": {+ "description": "visit token",+ "type": "string"+ },"website": {"description": "website","type": "string"diff --git a/docs/swagger.yaml b/docs/swagger.yamlindex 7e413cf7..851e8a86 100644--- a/docs/swagger.yaml+++ b/docs/swagger.yaml@@ -658,6 +658,9 @@ definitions:username:description: usernametype: string+ visit_token:+ description: visit token+ type: stringwebsite:description: websitetype: string@@ -941,53 +944,42 @@ definitions:schema.GetTagResp:properties:created_at:- description: created timetype: integerdescription:- description: description texttype: stringdisplay_name:- description: display nametype: stringexcerpt:- description: excerpttype: stringfollow_count:- description: follower amounttype: integeris_follower:- description: is followertype: booleanmain_tag_slug_name:description: if main tag slug name is not empty, this tag is synonymous withthe main tagtype: stringmember_actions:- description: MemberActionsitems:$ref: '#/definitions/schema.PermissionMemberAction'type: arrayoriginal_text:- description: original texttype: stringparsed_text:- description: parsed texttype: stringquestion_count:- description: question amounttype: integerrecommend:type: booleanreserved:type: booleanslug_name:- description: slug name+ type: string+ status:type: stringtag_id:- description: tag idtype: stringupdated_at:- description: updated timetype: integertype: objectschema.GetTagSynonymsResp:@@ -1508,6 +1500,8 @@ definitions:type: arraytitle:type: string+ url_title:+ type: stringuser_info:allOf:- $ref: '#/definitions/schema.SearchObjectUser'@@ -2302,6 +2296,9 @@ definitions:username:description: usernametype: string+ visit_token:+ description: visit token+ type: stringwebsite:description: websitetype: string@@ -4659,6 +4656,30 @@ paths:summary: get user personal votestags:- Activity+ /answer/api/v1/plugin/status:+ get:+ consumes:+ - application/json+ description: get all plugins status+ produces:+ - application/json+ responses:+ "200":+ description: OK+ schema:+ allOf:+ - $ref: '#/definitions/handler.RespBody'+ - properties:+ data:+ items:+ $ref: '#/definitions/schema.GetPluginListResp'+ type: array+ type: object+ security:+ - ApiKeyAuth: []+ summary: get all plugins status+ tags:+ - Plugin/answer/api/v1/post/render:post:consumes:diff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.goindex 4c6cddd8..1f96790f 100644--- a/internal/controller/question_controller.go+++ b/internal/controller/question_controller.go@@ -656,10 +656,15 @@ func (qc *QuestionController) UpdateQuestion(ctx *gin.Context) {handler.HandleResponse(ctx, err, resp)return}+ respInfo, ok := resp.(*schema.QuestionInfo)+ if !ok {+ handler.HandleResponse(ctx, err, resp)+ return+ }if !isAdmin || !linkUrlLimitUser {qc.actionService.ActionRecordAdd(ctx, entity.CaptchaActionEdit, req.UserID)}- handler.HandleResponse(ctx, nil, &schema.UpdateQuestionResp{WaitForReview: !req.NoNeedReview})+ handler.HandleResponse(ctx, nil, &schema.UpdateQuestionResp{UrlTitle: respInfo.UrlTitle, WaitForReview: !req.NoNeedReview})}// QuestionRecover recover deleted questiondiff --git a/internal/repo/search_common/search_repo.go b/internal/repo/search_common/search_repo.goindex 67996164..3745a645 100644--- a/internal/repo/search_common/search_repo.go+++ b/internal/repo/search_common/search_repo.go@@ -31,6 +31,7 @@ import ("github.com/apache/incubator-answer/pkg/htmltext""github.com/apache/incubator-answer/internal/base/data"+ "github.com/apache/incubator-answer/internal/base/handler""github.com/apache/incubator-answer/internal/base/reason""github.com/apache/incubator-answer/internal/entity""github.com/apache/incubator-answer/internal/schema"@@ -39,6 +40,7 @@ import (usercommon "github.com/apache/incubator-answer/internal/service/user_common""github.com/apache/incubator-answer/pkg/converter""github.com/apache/incubator-answer/pkg/obj"+ "github.com/apache/incubator-answer/pkg/uid""github.com/segmentfault/pacman/errors""xorm.io/builder")@@ -483,10 +485,19 @@ func (sr *searchRepo) parseResult(ctx context.Context, res []map[string][]byte)questionIDs = append(questionIDs, string(r["question_id"]))userIDs = append(userIDs, string(r["user_id"]))tp, _ := time.ParseInLocation("2006-01-02 15:04:05", string(r["created_at"]), time.Local)++ ID := string(r["id"])+ QuestionID := string(r["question_id"])+ if handler.GetEnableShortID(ctx) {+ ID = uid.EnShortID(ID)+ QuestionID = uid.EnShortID(QuestionID)+ }+object := &schema.SearchObject{- ID: string(r["id"]),- QuestionID: string(r["question_id"]),+ ID: ID,+ QuestionID: QuestionID,Title: string(r["title"]),+ UrlTitle: htmltext.UrlTitle(string(r["title"])),Excerpt: htmltext.FetchExcerpt(string(r["parsed_text"]), "...", 240),CreatedAtParsed: tp.Unix(),UserInfo: &schema.SearchObjectUser{diff --git a/internal/schema/question_schema.go b/internal/schema/question_schema.goindex 3d064023..7c079c25 100644--- a/internal/schema/question_schema.go+++ b/internal/schema/question_schema.go@@ -205,6 +205,7 @@ func (req *QuestionUpdate) Check() (errFields []*validator.FormErrorField, err etype QuestionBaseInfo struct {ID string `json:"id" `Title string `json:"title" xorm:"title"` // title+ UrlTitle string `json:"url_title" xorm:"url_title"` // titleViewCount int `json:"view_count" xorm:"view_count"` // view countAnswerCount int `json:"answer_count" xorm:"answer_count"` // answer countCollectionCount int `json:"collection_count" xorm:"collection_count"` // collection count@@ -255,6 +256,7 @@ type QuestionInfo struct {// UpdateQuestionResp update question resptype UpdateQuestionResp struct {+ UrlTitle string `json:"url_title"`WaitForReview bool `json:"wait_for_review"`}diff --git a/internal/schema/search_schema.go b/internal/schema/search_schema.goindex 398fad1e..e1533953 100644--- a/internal/schema/search_schema.go+++ b/internal/schema/search_schema.go@@ -115,6 +115,7 @@ type SearchObject struct {ID string `json:"id"`QuestionID string `json:"question_id"`Title string `json:"title"`+ UrlTitle string `json:"url_title"`Excerpt string `json:"excerpt"`CreatedAtParsed int64 `json:"created_at"`VoteCount int `json:"vote_count"`diff --git a/internal/service/question_common/question.go b/internal/service/question_common/question.goindex b12a9dec..136788cd 100644--- a/internal/service/question_common/question.go+++ b/internal/service/question_common/question.go@@ -591,8 +591,13 @@ func (qs *QuestionCommon) ShowListFormat(ctx context.Context, data *entity.Quest}func (qs *QuestionCommon) ShowFormat(ctx context.Context, data *entity.Question) *schema.QuestionInfo {+ ID := data.ID+ if handler.GetEnableShortID(ctx) {+ ID = uid.EnShortID(data.ID)+ }+info := schema.QuestionInfo{}- info.ID = data.ID+ info.ID = IDinfo.Title = data.Titleinfo.UrlTitle = htmltext.UrlTitle(data.Title)info.Content = data.OriginalTextdiff --git a/internal/service/question_service.go b/internal/service/question_service.goindex b550a1f9..f9159304 100644--- a/internal/service/question_service.go+++ b/internal/service/question_service.go@@ -754,7 +754,6 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest_, existUnreviewed, err := qs.revisionService.ExistUnreviewedByObjectID(ctx, req.ID)if err != nil {return-}if existUnreviewed {err = errors.BadRequest(reason.QuestionCannotUpdate)@@ -1196,6 +1195,7 @@ func (qs *QuestionService) GetQuestionsByTitle(ctx context.Context, title stringitem := &schema.QuestionBaseInfo{}item.ID = question.IDitem.Title = question.Title+ item.UrlTitle = htmltext.UrlTitle(question.Title)item.ViewCount = question.ViewCountitem.AnswerCount = question.AnswerCountitem.CollectionCount = question.CollectionCountdiff --git a/ui/src/pages/Questions/Ask/index.tsx b/ui/src/pages/Questions/Ask/index.tsxindex f24385fc..3a465a63 100644--- a/ui/src/pages/Questions/Ask/index.tsx+++ b/ui/src/pages/Questions/Ask/index.tsx@@ -288,7 +288,7 @@ const Ask = () => {modifyQuestion(ep).then(async (res) => {await editCaptcha.close();- navigate(pathFactory.questionLanding(qid, params.url_title), {+ navigate(pathFactory.questionLanding(qid, res?.url_title), {state: { isReview: res?.wait_for_review },});})@@ -340,7 +340,7 @@ const Ask = () => {if (checked) {navigate(pathFactory.questionLanding(id, res?.question?.url_title));} else {- navigate(pathFactory.questionLanding(id));+ navigate(pathFactory.questionLanding(id, res?.url_title));}}removeDraft();