gitea/amati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull Request branch dev-clone to main #1

Merged
gitea merged 429 commits from dev-clone into main 2024-12-23 09:31:34 +00:00
Conversation 0 Commits 429 Files Changed 142 +4 -5
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bdca7a19cf - Show all commits

7
apps/backend/src/routes/users/route.ts
View File

@ -440,10 +440,9 @@ const usersRoute = new Hono<HonoEnv>()
await trx await trx
.update(users) .update(users)
.set({ .set({
...userData, name: userData.name,
...(userData.password username: userData.username,
? { password: await hashPassword(userData.password) } email: userData.email,
: {}),
updatedAt: new Date(), updatedAt: new Date(),
isEnabled: userData.isEnabled.toLowerCase() === "true", isEnabled: userData.isEnabled.toLowerCase() === "true",
}) })

2
apps/frontend/src/modules/usersManagement/modals/UserFormModal.tsx
View File

@ -168,7 +168,7 @@ export default function UserFormModal() {
} }
queryClient.invalidateQueries({ queryKey: ["users"] }); queryClient.invalidateQueries({ queryKey: ["users"] });
notifications.show({ notifications.show({
message: `The ser is ${formType === "tambah" ? "created" : "edited"}`, message: `The user is ${formType === "tambah" ? "created" : "edited"}`,
}); });
navigate({ search: {} }); navigate({ search: {} });