Merged in hotfix/2026-01-30 (pull request #2925)

IO-3529 DMS Make Code
2026-01-31 06:46:32 +00:00
parent 27b955a701 ff3d24c623
commit eb36b12cb0
1 changed files with 8 additions and 5 deletions
--- a/client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx
+++ b/client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx
@@ -49,12 +49,15 @@ export function DmsCdkVehicles({ form, job }) {
        open={open}
        onCancel={() => setOpen(false)}
        onOk={() => {
-          form.setFieldsValue({
-            dms_make: selectedModel.makecode,
-            dms_model: selectedModel.modelcode
-          });
-          setOpen(false);
+          if (selectedModel) {
+            form.setFieldsValue({
+              dms_make: selectedModel.makecode,
+              dms_model: selectedModel.modelcode
+            });
+            setOpen(false);
+          }
        }}
+        okButtonProps={{ disabled: !selectedModel }}
      >
        {error && <AlertComponent title={error.message} type="error" />}
        <Table