Skip to content

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(tag): add user can use reserved tag permissionˆ

LinkinStarc4e60235e838
diff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.go
index d1dc3a01..db2cb9bc 100644
--- a/internal/controller/question_controller.go
+++ b/internal/controller/question_controller.go
@@ -296,6 +296,7 @@ func (qc *QuestionController) UpdateQuestion(ctx *gin.Context) {
permission.QuestionEdit,
permission.QuestionDelete,
permission.QuestionEditWithoutReview,
+ permission.TagUseReservedTag,
}, req.ID)
if err != nil {
handler.HandleResponse(ctx, err, nil)
@@ -304,16 +305,18 @@ func (qc *QuestionController) UpdateQuestion(ctx *gin.Context) {
req.CanEdit = canList[0]
req.CanDelete = canList[1]
req.NoNeedReview = canList[2]
-
- req.CanClose = middleware.GetIsAdminFromContext(ctx)
- req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
+ req.CanUseReservedTag = canList[3]
if !req.CanEdit {
handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
return
}
- _, err = qc.questionService.UpdateQuestion(ctx, req)
- handler.HandleResponse(ctx, err, &schema.UpdateQuestionResp{WaitForReview: !req.NoNeedReview})
+ resp, err := qc.questionService.UpdateQuestion(ctx, req)
+ if err != nil {
+ handler.HandleResponse(ctx, err, resp)
+ return
+ }
+ handler.HandleResponse(ctx, nil, &schema.UpdateQuestionResp{WaitForReview: !req.NoNeedReview})
}
// CloseMsgList close question msg list
diff --git a/internal/migrations/v4.go b/internal/migrations/v4.go
index e41d20fe..9d32b13f 100644
--- a/internal/migrations/v4.go
+++ b/internal/migrations/v4.go
@@ -121,6 +121,7 @@ func addRoleFeatures(x *xorm.Engine) error {
{RoleID: 2, PowerType: permission.AnswerAudit},
{RoleID: 2, PowerType: permission.QuestionAudit},
{RoleID: 2, PowerType: permission.TagAudit},
+ {RoleID: 2, PowerType: permission.TagUseReservedTag},
{RoleID: 3, PowerType: permission.QuestionAdd},
{RoleID: 3, PowerType: permission.QuestionEdit},
@@ -154,6 +155,7 @@ func addRoleFeatures(x *xorm.Engine) error {
{RoleID: 3, PowerType: permission.AnswerAudit},
{RoleID: 3, PowerType: permission.QuestionAudit},
{RoleID: 3, PowerType: permission.TagAudit},
+ {RoleID: 3, PowerType: permission.TagUseReservedTag},
}
// insert default powers
@@ -190,6 +192,7 @@ func addRoleFeatures(x *xorm.Engine) error {
defaultConfigTable := []*entity.Config{
{ID: 115, Key: "rank.question.close", Value: `-1`},
{ID: 116, Key: "rank.question.reopen", Value: `-1`},
+ {ID: 117, Key: "rank.tag.use_reserved_tag", Value: `-1`},
}
for _, c := range defaultConfigTable {
exist, err := x.Get(&entity.Config{ID: c.ID, Key: c.Key})
diff --git a/internal/schema/question_schema.go b/internal/schema/question_schema.go
index 25d20557..5b3a5586 100644
--- a/internal/schema/question_schema.go
+++ b/internal/schema/question_schema.go
@@ -51,6 +51,8 @@ type QuestionPermission struct {
CanClose bool `json:"-"`
// whether user can reopen it
CanReopen bool `json:"-"`
+ // whether user can use reserved it
+ CanUseReservedTag bool `json:"-"`
}
type CheckCanQuestionUpdate struct {
@@ -76,7 +78,6 @@ type QuestionUpdate struct {
EditSummary string `validate:"omitempty" json:"edit_summary"`
// user id
UserID string `json:"-"`
- IsAdmin bool `json:"-"`
NoNeedReview bool `json:"-"`
QuestionPermission
}
diff --git a/internal/service/permission/permission_name.go b/internal/service/permission/permission_name.go
index 3d2e4838..45c91278 100644
--- a/internal/service/permission/permission_name.go
+++ b/internal/service/permission/permission_name.go
@@ -34,4 +34,5 @@ const (
AnswerAudit = "answer.audit"
QuestionAudit = "question.audit"
TagAudit = "tag.audit"
+ TagUseReservedTag = "tag.use_reserved_tag"
)
diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index ea46c533..16266afb 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -352,10 +352,8 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
return questionInfo, tagerr
}
- // If it's not admin
- if !req.IsAdmin {
- //CheckChangeTag
-
+ // if user can not use reserved tag, old reserved tag can not be removed and new reserved tag can not be added.
+ if !req.CanUseReservedTag {
CheckTag, CheckTaglist := qs.CheckChangeReservedTag(ctx, oldTags, Tags)
if !CheckTag {
errMsg := fmt.Sprintf(`The reserved tag "%s" must be present.`,
@@ -393,7 +391,7 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
Log: req.EditSummary,
}
- if req.NoNeedReview || req.IsAdmin || dbinfo.UserID == req.UserID {
+ if req.NoNeedReview {
canUpdate = true
}