Michael/Regisflow
1
0 Fork 0
mirror of https://github.com/R0m1k3/Regisflow.git synced 2026-10-23 15:18:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve user editing, allowing admins access to all stores without assignment

Browse Source 
Updates user editing logic to handle admin roles and store access, with schema changes.

Replit-Commit-Author: Agent
Replit-Commit-Session-Id: 91318273-c764-4fd4-be04-bdc12c38af32
Replit-Commit-Screenshot-Url: https://storage.googleapis.com/screenshot-production-us-central1/0715008c-7244-40f4-befc-26c014852236/9d9e1107-c416-4124-a939-a91c612c56a1.jpg
This commit is contained in:
michaelschal committed 2025-07-09 23:23:51 +00:00
1 parent bedb7bd4cc
commit 4dbdda2071
3 files changed
+39 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

attached_assets/image_1752103355483.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 61 KiB

client/src/components/Administration.tsx
+38 -21
View File
@@ -253,7 +253,15 @@ export default function Administration() {
}; };
const onEditUser = async (data: EditUserData) => { const onEditUser = async (data: EditUserData) => {
await updateUserMutation.mutateAsync(data); const isEditingSelf = editingUser?.id === currentUser?.id;
// Si on modifie son propre profil, on ne doit pas envoyer le champ role
if (isEditingSelf) {
const { role, ...dataWithoutRole } = data;
await updateUserMutation.mutateAsync(dataWithoutRole);
} else {
await updateUserMutation.mutateAsync(data);
}
}; };
const onCreateStore = async (data: z.infer<typeof insertStoreSchema>) => { const onCreateStore = async (data: z.infer<typeof insertStoreSchema>) => {
@@ -862,26 +870,35 @@ export default function Administration() {
<FormField <FormField
control={editUserForm.control} control={editUserForm.control}
name="storeId" name="storeId"
render={({ field }) => ( render={({ field }) => {
<FormItem> const isEditingSelf = editingUser?.id === currentUser?.id;
<FormLabel>Magasin</FormLabel> return (
<Select value={field.value?.toString()} onValueChange={(value) => field.onChange(value ? parseInt(value) : undefined)}> <FormItem>
<FormControl> <FormLabel>Magasin</FormLabel>
<SelectTrigger> <Select value={field.value?.toString() || "none"} onValueChange={(value) => field.onChange(value === "none" ? undefined : parseInt(value))}>
<SelectValue placeholder="Sélectionner un magasin" /> <FormControl>
</SelectTrigger> <SelectTrigger>
</FormControl> <SelectValue placeholder="Sélectionner un magasin" />
<SelectContent> </SelectTrigger>
{stores.map((store) => ( </FormControl>
<SelectItem key={store.id} value={store.id.toString()}> <SelectContent>
{store.name} <SelectItem value="none">Aucun magasin (accès à tous)</SelectItem>
</SelectItem> {stores.map((store) => (
))} <SelectItem key={store.id} value={store.id.toString()}>
</SelectContent> {store.name}
</Select> </SelectItem>
<FormMessage /> ))}
</FormItem> </SelectContent>
)} </Select>
{isEditingSelf && (
<p className="text-sm text-muted-foreground">
En tant qu'administrateur, vous pouvez accéder à tous les magasins
</p>
)}
<FormMessage />
</FormItem>
);
}}
/> />
</div> </div>
<div className="flex justify-end space-x-2"> <div className="flex justify-end space-x-2">
server/routes.ts
+1 -1
View File
@@ -295,7 +295,7 @@ export async function registerRoutes(app: Express): Promise<Server> {
const userData = insertUserSchema.partial().parse(req.body); const userData = insertUserSchema.partial().parse(req.body);
// Protection spécifique pour le rôle seulement // Protection spécifique pour le rôle seulement
if (userData.role) { if (userData.role !== undefined) {
// Protection : empêcher un admin de changer son propre rôle par accident // Protection : empêcher un admin de changer son propre rôle par accident
if (userId === currentUser?.id && userData.role !== 'administrator') { if (userId === currentUser?.id && userData.role !== 'administrator') {
return res.status(400).json({ return res.status(400).json({