Merge branch 'develop' into hotfix/1.0.5

kevin-lann · web-flow · commit c43399caaa75 · 2025-03-30T19:17:51.000-04:00
diff --git a/course-matrix/frontend/src/pages/TimetableBuilder/CreateCustomSetting.tsx b/course-matrix/frontend/src/pages/TimetableBuilder/CreateCustomSetting.tsx
@@ -175,6 +175,7 @@ const CreateCustomSetting = ({
                             restrictionForm.setValue("maxGap", undefined);
                             restrictionForm.setValue("numDays", undefined);
                           }}
+                          value={field.value}
                           defaultValue={""}
                         >
                           <SelectTrigger className="w-[320px]">

Original file line number	Diff line number	Diff line change
`@@ -175,6 +175,7 @@ const CreateCustomSetting = ({`
`175`	`175`	`restrictionForm.setValue("maxGap", undefined);`
`176`	`176`	`restrictionForm.setValue("numDays", undefined);`
`177`	`177`	`}}`
	`178`	`+ value={field.value}`
`178`	`179`	`defaultValue={""}`
`179`	`180`	`>`
`180`	`181`	`<SelectTrigger className="w-[320px]">`