Merge remote-tracking branch 'origin/issue-114-backend' into issue-5185

specify · Oct 16, 2024 · b4a910d · b4a910d
2 parents 656518e + eb724c9
commit b4a910d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/specifyweb/context/schema_localization.py b/specifyweb/context/schema_localization.py
@@ -117,7 +117,7 @@ def get_schema_localization(collection, schematype, lang):
     cfields = ('format', 'ishidden', 'isuiformatter', 'picklistname', 'type', 'aggregator', 'defaultui', 'name', 'desc')
 
     containers = {
-        row[0]: dict(items={}, **{field: row[i+1] for i, field in enumerate(cfields)})
+        row[0].lower(): dict(items={}, **{field: row[i+1] for i, field in enumerate(cfields)})
         for row in cursor.fetchall()
     }
 
@@ -172,7 +172,7 @@ def get_schema_localization(collection, schematype, lang):
     ifields = ('format', 'ishidden', 'isuiformatter', 'picklistname', 'type', 'isrequired', 'weblinkname', 'name', 'desc')
 
     for row in cursor.fetchall():
-        containers[row[0]]['items'][row[1].lower()] = {field: row[i+2] for i, field in enumerate(ifields)}
+        containers[row[0].lower()]['items'][row[1].lower()] = {field: row[i+2] for i, field in enumerate(ifields)}
 
     return containers
 
diff --git a/specifyweb/frontend/js_src/lib/components/SchemaConfig/UniquenessRuleRow.tsx b/specifyweb/frontend/js_src/lib/components/SchemaConfig/UniquenessRuleRow.tsx
@@ -84,7 +84,7 @@ export function UniquenessRuleRow({
           <Input.Text
             form={formId}
             forwardRef={index === 0 ? validationRef : undefined}
-            isReadOnly={!(index === 0 && hasDuplicates)}
+            isReadOnly
             key={index}
             value={
               (fields.find(({ name }) => name === field) ??

diff --git a/specifyweb/frontend/js_src/lib/components/SchemaConfig/UniquenessRuleScope.tsx b/specifyweb/frontend/js_src/lib/components/SchemaConfig/UniquenessRuleScope.tsx
@@ -61,7 +61,7 @@ export function UniquenessRuleScope({
             isDefault: false,
             isEnabled: true,
             isRelationship: true,
-            optionLabel: relationship.localization.name!,
+            optionLabel: relationship.localization.name ?? relationship.name,
             tableName: relationship.relatedTable.name,
           },
         ])