Account for localization.isrequired with field.isRequired

Fixes #4720
specify · Apr 2, 2024 · 1fd8bdc · 1fd8bdc
1 parent 968fc20
commit 1fd8bdc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/specifyweb/frontend/js_src/lib/components/DataModel/businessRules.ts b/specifyweb/frontend/js_src/lib/components/DataModel/businessRules.ts
@@ -342,7 +342,7 @@ export class BusinessRuleManager<SCHEMA extends AnySchema> {
             return true;
           if (
             field !== undefined &&
-            !(field.isRequired || field.localization.isrequired) &&
+            !field.isRequired &&
             (value === undefined || value === null)
           ) {
             return false;

diff --git a/specifyweb/frontend/js_src/lib/components/DataModel/specifyField.ts b/specifyweb/frontend/js_src/lib/components/DataModel/specifyField.ts
@@ -131,19 +131,19 @@ export abstract class FieldBase {
     this.isReadOnly =
       globalFieldOverride === 'readOnly' || fieldDefinition.readOnly === true;
 
+    this.localization =
+      this.table.localization.items[this.name.toLowerCase()] ?? {};
+
     this.isRequired =
       globalFieldOverride === 'required'
         ? true
         : globalFieldOverride === 'optional'
         ? false
-        : fieldDefinition.required;
+        : fieldDefinition.required || (this.localization?.isrequired ?? false);
     this.type = fieldDefinition.type;
     this.length = fieldDefinition.length;
     this.databaseColumn = fieldDefinition.column;
 
-    this.localization =
-      this.table.localization.items[this.name.toLowerCase()] ?? {};
-
     this.label =
       typeof this.localization.name === 'string' &&
       this.localization.name.length > 0