fix: unable to modify team's avatar

ElaBosak233 · Jun 2, 2024 · 81a0be2 · 81a0be2
1 parent 9b44b2b
commit 81a0be2
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/internal/controller/team.go b/internal/controller/team.go
@@ -348,6 +348,7 @@ func (c *TeamController) Leave(ctx *gin.Context) {
 func (c *TeamController) SaveAvatar(ctx *gin.Context) {
 	id := convertor.ToUintD(ctx.Param("id"), 0)
 	fileHeader, err := ctx.FormFile("file")
+	fmt.Println("coming!!!!!!!!!!!!!!!!!!!!!")
 	if err != nil {
 		ctx.JSON(http.StatusBadRequest, gin.H{
 			"code": http.StatusBadRequest,

diff --git a/internal/extension/casbin/policy.go b/internal/extension/casbin/policy.go
@@ -20,6 +20,8 @@ func initDefaultPolicy() {
 		{"user", "/api/teams/{id}", "PUT"},
 		{"user", "/api/teams/{id}", "GET"},
 		{"user", "/api/teams/{id}", "DELETE"},
+		{"user", "/api/teams/{id}/avatar", "POST"},
+		{"user", "/api/teams/{id}/avatar", "DELETE"},
 		{"user", "/api/teams/{id}/invite", "PUT"},
 		{"user", "/api/teams/{id}/invite", "GET"},
 		{"user", "/api/teams/{id}/users/{user_id}", "DELETE"},

diff --git a/internal/model/team.go b/internal/model/team.go
@@ -23,11 +23,6 @@ type Team struct {
 	Users       []*User `gorm:"many2many:user_teams;" json:"users,omitempty"`      // The team's users.
 }
 
-func (t *Team) Simplify() {
-	t.InviteToken = ""
-	t.Description = ""
-}
-
 func (t *Team) AfterFind(db *gorm.DB) (err error) {
 	p := path.Join(utils.MediaPath, "teams", fmt.Sprintf("%d", t.ID))
 	var name string

diff --git a/internal/service/team.go b/internal/service/team.go
@@ -78,7 +78,7 @@ func (t *TeamService) Delete(id uint) error {
 func (t *TeamService) Find(req request.TeamFindRequest) (teams []model.Team, total int64, err error) {
 	teams, total, err = t.teamRepository.Find(req)
 	for index, team := range teams {
-		team.Simplify()
+		team.InviteToken = ""
 		teams[index] = team
 	}
 	return teams, total, err

diff --git a/web/src/components/modals/TeamEditModal.tsx b/web/src/components/modals/TeamEditModal.tsx
@@ -490,7 +490,9 @@ export default function TeamEditModal(props: TeamEditModalProps) {
 									<Flex mt={20} justify={"end"} gap={10}>
 										<Button
 											leftSection={
-												<MDIcon>swap_horiz</MDIcon>
+												<MDIcon color="red">
+													swap_horiz
+												</MDIcon>
 											}
 											onClick={openDeleteTeamModal}
 											color="red"

diff --git a/web/src/pages/register.tsx b/web/src/pages/register.tsx
@@ -53,7 +53,10 @@ export default function Page() {
 	});
 
 	function register() {
-		if (configStore?.captchaCfg?.enabled && !form.getValues().token) {
+		if (
+			configStore?.pltCfg?.user?.register?.captcha?.enabled &&
+			!form.getValues().token
+		) {
 			showErrNotification({
 				title: "注册失败",
 				message: "请完成验证码验证",