Fixed admin Position Add Form.

vzdc-artcc · Jan 23, 2025 · 90a4c5a · 90a4c5a
1 parent 4fefa75
commit 90a4c5a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/actions/eventPosition.ts b/actions/eventPosition.ts
@@ -59,7 +59,7 @@ export const saveEventPosition = async (event: Event, formData: FormData, admin?
         return { errors: [{ message: 'Positions are locked for this event' }] };
     }
 
-    if ((await prisma.eventPosition.count({ where: { eventId: event.id, userId: session.user.id } })) > 0) {
+    if ((await prisma.eventPosition.count({ where: { eventId: event.id, userId: admin ? formData.get('userId') as string : session.user.id } })) > 0) {
         return { errors: [{ message: admin ? 'This controller already has a position request' : 'You have already requested a position for this event' }] };
     }
 

diff --git a/components/EventPosition/EventPositionRequestForm.tsx b/components/EventPosition/EventPositionRequestForm.tsx
@@ -92,7 +92,7 @@ export default function EventPositionRequestForm({ admin, currentUser, event, ev
                     </Grid2>
                     <Grid2 size={6}>
                         { admin && <FormSaveButton text="Add" icon={<Add />} /> }
-                        { !eventPosition && !event.positionsLocked && <FormSaveButton text="Request" icon={<Add />} /> }
+                        { !admin && !eventPosition && !event.positionsLocked && <FormSaveButton text="Request" icon={<Add />} /> }
                         { !admin && eventPosition && !event.positionsLocked && <Button type="button" variant="contained" color="error" startIcon={<Delete />} onClick={() => deleteEventPosition(event, eventPosition.id)}>Delete</Button> }
                         { !admin && event.positionsLocked && <Typography sx={{ mt: 2, }}>Positions are locked for this event.</Typography> }
                         { !admin && <Typography sx={{ mt: 2, }}>You will recieve an email once your final position and time has been published.</Typography> }