Merge pull request #4703 from specify/issue-4693

Always show saveBlocker dialog for unclaimed blockers
specify · Apr 2, 2024 · 968fc20 · 968fc20
2 parents fc13b44 + 34c5ee1
commit 968fc20
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/specifyweb/frontend/js_src/lib/components/DataModel/businessRules.ts b/specifyweb/frontend/js_src/lib/components/DataModel/businessRules.ts
@@ -335,10 +335,18 @@ export class BusinessRuleManager<SCHEMA extends AnySchema> {
             value: otherValue,
           } = otherFieldValues;
           const { id, cid, value } = fieldValues[fieldName];
+          const field = this.resource.specifyTable.getField(fieldName);
           if (otherCid !== undefined && cid !== undefined && otherCid === cid)
             return true;
           if (otherId !== undefined && id !== undefined && otherId === id)
             return true;
+          if (
+            field !== undefined &&
+            !(field.isRequired || field.localization.isrequired) &&
+            (value === undefined || value === null)
+          ) {
+            return false;
+          }
           return (
             otherId === undefined &&
             otherCid === undefined &&

diff --git a/specifyweb/frontend/js_src/lib/components/DataModel/saveBlockers.tsx b/specifyweb/frontend/js_src/lib/components/DataModel/saveBlockers.tsx
@@ -277,5 +277,6 @@ export const findUnclaimedBlocker = (
           },
         ]) !== undefined
       );
+    else if (currentListeners.length === 0) return true;
     else return false;
   });