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/0.6.0/user-role' into test

LinkinStard95bd6aa7909
diff --cc cmd/answer/wire_gen.go
index aa4e9c5b,e0747ba3..fb67a16d
--- a/cmd/answer/wire_gen.go
+++ b/cmd/answer/wire_gen.go
@@@ -191,9 -199,10 +199,10 @@@ func initApplication(debug bool, server
commentCommonService := comment_common.NewCommentCommonService(commentCommonRepo)
activityService := activity2.NewActivityService(activityActivityRepo, userCommon, activityCommon, tagCommonService, objService, commentCommonService, revisionService, metaService)
activityController := controller.NewActivityController(activityCommon, activityService)
- answerAPIRouter := router.NewAnswerAPIRouter(langController, userController, commentController, reportController, voteController, tagController, followController, collectionController, questionController, answerController, searchController, revisionController, rankController, controller_backyardReportController, userBackyardController, reasonController, themeController, siteInfoController, siteinfoController, notificationController, dashboardController, uploadController, activityController)
+ roleController := controller_backyard.NewRoleController(roleService)
+ answerAPIRouter := router.NewAnswerAPIRouter(langController, userController, commentController, reportController, voteController, tagController, followController, collectionController, questionController, answerController, searchController, revisionController, rankController, controller_backyardReportController, userBackyardController, reasonController, themeController, siteInfoController, siteinfoController, notificationController, dashboardController, uploadController, activityController, roleController)
swaggerRouter := router.NewSwaggerRouter(swaggerConf)
- uiRouter := router.NewUIRouter()
+ uiRouter := router.NewUIRouter(siteinfoController)
authUserMiddleware := middleware.NewAuthUserMiddleware(authService)
avatarMiddleware := middleware.NewAvatarMiddleware(serviceConf, uploaderService)
ginEngine := server.NewHTTPServer(debug, staticRouter, answerAPIRouter, swaggerRouter, uiRouter, authUserMiddleware, avatarMiddleware)
diff --cc i18n/zh_CN.yaml
index 413dc19f,4f412b8d..06c93b84
--- a/i18n/zh_CN.yaml
+++ b/i18n/zh_CN.yaml
@@@ -97,12 -105,8 +113,14 @@@ backend
other: "用户名已被使用"
set_avatar:
other: "头像设置错误"
+ cannot_update_your_role:
+ other: "你无法修改自己的角色"
+ revision:
+ review_underway:
+ other: "目前无法编辑,有一个版本在审阅队列中。"
+ no_permission:
+ other: "无权限修改"
+
report:
spam:
name:
diff --cc internal/controller/answer_controller.go
index 2b91d779,bb504792..d089d509
--- a/internal/controller/answer_controller.go
+++ b/internal/controller/answer_controller.go
@@@ -159,9 -160,9 +160,9 @@@ func (ac *AnswerController) Update(ctx
req.UserID = middleware.GetLoginUserIDFromContext(ctx)
canList, err := ac.rankService.CheckOperationPermissions(ctx, req.UserID, []string{
- rank.AnswerEditRank,
- rank.AnswerEditWithoutReviewRank,
+ permission.AnswerEdit,
+ permission.AnswerEditWithoutReview,
- }, "")
+ }, req.ID)
if err != nil {
handler.HandleResponse(ctx, err, nil)
return