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.

Merge branch 'feat/1.0.7/tag' into feat/1.0.7/short-id

aichy1261cd1946532e3
diff --cc internal/controller/activity_controller.go
index 8f8e6f20,78140b67..bb7260cc
--- a/internal/controller/activity_controller.go
+++ b/internal/controller/activity_controller.go
@@@ -6,7 -6,7 +6,8 @@@ import
"github.com/answerdev/answer/internal/schema"
"github.com/answerdev/answer/internal/service/activity"
"github.com/answerdev/answer/internal/service/activity_common"
+ "github.com/answerdev/answer/internal/service/role"
+ "github.com/answerdev/answer/pkg/uid"
"github.com/gin-gonic/gin"
)
diff --cc internal/controller/answer_controller.go
index 58fd56c4,28b61141..93803c0e
--- a/internal/controller/answer_controller.go
+++ b/internal/controller/answer_controller.go
@@@ -50,10 -49,12 +50,12 @@@ func (ac *AnswerController) RemoveAnswe
if handler.BindAndCheck(ctx, req) {
return
}
-
+ req.ID = uid.DeShortID(req.ID)
req.UserID = middleware.GetLoginUserIDFromContext(ctx)
- req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
- can, err := ac.rankService.CheckOperationPermission(ctx, req.UserID, permission.AnswerDelete, req.ID)
+ objectOwner := ac.rankService.CheckOperationObjectOwner(ctx, req.UserID, req.ID)
+ canList, err := ac.rankService.CheckOperationPermissions(ctx, req.UserID, []string{
+ permission.AnswerDelete,
+ })
if err != nil {
handler.HandleResponse(ctx, err, nil)
return
diff --cc internal/service/answer_service.go
index baeaca00,738e4a55..38e0826f
--- a/internal/service/answer_service.go
+++ b/internal/service/answer_service.go
@@@ -20,9 -20,9 +20,10 @@@ import
"github.com/answerdev/answer/internal/service/permission"
questioncommon "github.com/answerdev/answer/internal/service/question_common"
"github.com/answerdev/answer/internal/service/revision_common"
+ "github.com/answerdev/answer/internal/service/role"
usercommon "github.com/answerdev/answer/internal/service/user_common"
"github.com/answerdev/answer/pkg/encryption"
+ "github.com/answerdev/answer/pkg/uid"
"github.com/segmentfault/pacman/errors"
"github.com/segmentfault/pacman/log"
)