gitea-admin/lti-web-client
1
0
Fork 0
mirror of https://gitlab.com/mbugroup/lti-web-client.git synced 2026-05-20 13:32:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(resolve): fix resolve mismatch conflict path on merge

Browse Source
This commit is contained in:
rstubryan
2025-10-21 15:20:15 +07:00
parent 12202c2021
commit e7e0e308c7
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/pages/flock/recording/form/RecordingForm.tsx
+6 -2
View File
@@ -553,7 +553,11 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
return ( return (
<> <>
<section className='w-full'> <section className='w-full'>
<FormHeader type={type} title='Recording' backUrl='/flock/recording' /> <FormHeader
type={type}
title='Recording'
backUrl='/production/recording'
/>
<form <form
onSubmit={formik.handleSubmit} onSubmit={formik.handleSubmit}
className='w-full mt-8 flex flex-col gap-6' className='w-full mt-8 flex flex-col gap-6'
@@ -1558,7 +1562,7 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
formik={formik} formik={formik}
editUrl={ editUrl={
initialValues initialValues
? `/flock/recording/detail/edit/?recordingId=${initialValues.id}` ? `/production/recording/detail/edit/?recordingId=${initialValues.id}`
: undefined : undefined
} }
onDelete={deleteRecordingClickHandler} onDelete={deleteRecordingClickHandler}