Merge remote-tracking branch 'origin/production' into issue-6127

Author: sharadsw

CHANGELOG.md

@@ -8,6 +8,35 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [7.10.2](https://github.com/specify/specify7/compare/v7.10.1...v7.10.2) (23 April 2025)
+
+## Added
+
+* **[Batch Editing](https://discourse.specifysoftware.org/t/batch-edit/2248)** for simple fields ([#5417](https://github.com/specify/specify7/pull/5417) – *Requested by many, many members*)
+* [**Added a 'Download' button** to record set and query results attachments](https://discourse.specifysoftware.org/t/bulk-download-attachments-from-a-query-result-or-record-set/2456) ([#6052](https://github.com/specify/specify7/pull/6052) – *Requested by The University of Michigan, Naturhistorisches Museum Bern, Beaty Biodiversity Museum, Agriculture and Agri-Food Canada, Muséum d'Histoire Naturelle Geneva, and Queensland Herbarium*)
+* The [Form Meta menu](https://discourse.specifysoftware.org/t/form-meta-menu/844) is now accessible when using "View in Forms" ([#5416](https://github.com/specify/specify7/pull/5416))
+* A default value can now be used for a query combo box ([#6037]([https://github.com/specify/specify7/pull/6037]) – *Requested by South African Institute for Aquatic Biodiversity and The Ohio State University Mollusk Division*)
+* Adds tooltip for required fields in bulk carry forward config ([#6202](https://github.com/specify/specify7/pull/6202))
+* Specify will use the default `TypeSearches` when a custom one is not defined for a table ([#6236](https://github.com/specify/specify7/pull/6236))
+* Adds a new `uniqueIdentifier` field to Storage ([#6249](https://github.com/specify/specify7/pull/6249))
+
+## Changed
+
+* Non-default Taxon trees can be deleted if they are not used ([#6186](https://github.com/specify/specify7/pull/6186))
+* Adds modern attachment placeholder icons for video, audio, text, and other attachment filetypes ([#6119](https://github.com/specify/specify7/pull/6119))
+
+## Fixed
+
+* Fixes an issue that caused some WorkBench data sets to match to the incorrect ranks ([#6322](https://github.com/specify/specify7/pull/6322))
+* Fixes an issue where the defaults for insect collections were missing ([#6383](https://github.com/specify/specify7/pull/6383))
+* Field formats in the Schema Config utility are selected automatically again ([#6255](https://github.com/specify/specify7/pull/6255))
+* Primary Collection Objects (COs) in a consolidated Collection Object Group (COG) can no longer be deleted unless another CO is marked as primary ([#6181](https://github.com/specify/specify7/pull/6181))
+* Fixes all cases where table aggregation separators were missing ([#6115](https://github.com/specify/specify7/pull/6115))
+* Fixes all cases where taxon tree structure is invalid due to accepted names not being designated as accepted ([#5366](https://github.com/specify/specify7/pull/5366))
+* Fixes all cases where coordinate text fields are empty but decimal coordinate fields contain values ([#5368](https://github.com/specify/specify7/pull/5368) – *Reported by The University of Michigan, College of Idaho, and several others*)
+* Fixes an issue where the Data Entry screen does not appear in the 'Geology' discipline ([#6365](https://github.com/specify/specify7/pull/6365))
+* Fixes an issue where unsaved changes would be lost when toggling the "Use Localized Field Labels" setting in the Form Meta menu
+
 ## [7.10.1](https://github.com/specify/specify7/compare/v7.10.0...v7.10.1) (10 March 2025)
 
 ## Added

specifyweb/frontend/js_src/lib/components/DataModel/businessRuleDefs.ts

@@ -659,6 +659,35 @@ export const businessRuleDefs: MappedBusinessRuleDefs = {
     },
   },
   Preparation: {
+    fieldChecks: {
+      countAmt: async (prep): Promise<BusinessRuleResult | undefined> => {
+        const loanPrep = await prep.rgetCollection('loanPreparations');
+        const totalPrep = prep.get('countAmt') ?? 0;
+        let totalPrepLoaned = 0;
+
+        loanPrep.models.forEach((loan) => {
+          const quantity = loan.get('quantity') ?? 0;
+          totalPrepLoaned += quantity;
+        });
+
+        if (totalPrep < totalPrepLoaned) {
+          setSaveBlockers(
+            prep,
+            prep.specifyTable.field.countAmt,
+            [resourcesText.preparationUsedInLoan()],
+            PREPARATION_LOANED_KEY
+          );
+        } else {
+          setSaveBlockers(
+            prep,
+            prep.specifyTable.field.countAmt,
+            [],
+            PREPARATION_LOANED_KEY
+          );
+        }
+        return undefined;
+      },
+    },
     onRemoved: (preparation, collection): void => {
       if (preparation.get('isOnLoan') === true) {
         setSaveBlockers(

specifyweb/frontend/js_src/lib/components/FormFields/Field.tsx

@@ -128,29 +128,56 @@ function Field({
 
   const isNew = resource?.isNew();
   const isCO = resource?.specifyTable.name === 'CollectionObject';
+
   const isPartOfCOG = isCO
     ? resource?.get('cojo') !== null && resource?.get('cojo') !== undefined
     : false;
+
+  const hasParentCO = isCO
+    ? resource.get('parentCO') !== null &&
+      resource.get('parentCO') !== undefined
+    : false;
+
   const isCatNumberField = field?.name === 'catalogNumber';
+
   // Check if collection pref wants to inherit primary cat num for empty CO cat num sibilings inside of a COG
   const [displayPrimaryCatNumberPref] = collectionPreferences.use(
     'catalogNumberInheritance',
     'behavior',
     'inheritance'
   );
-  const displayCatNumberPlaceHolder =
+
+  // Check if collection pref wants to inherit parent cat num for empty CO cat num children
+  const [displayParentCatNumberPref] = collectionPreferences.use(
+    'catalogNumberParentInheritance',
+    'behavior',
+    'inheritance'
+  );
+
+  const displayPrimaryCatNumberPlaceHolder =
     isNew === false &&
     isCO &&
     isPartOfCOG &&
     isCatNumberField &&
     displayPrimaryCatNumberPref;
 
+  const displayParentCatNumberPlaceHolder =
+    isNew === false &&
+    isCO &&
+    hasParentCO &&
+    isCatNumberField &&
+    displayParentCatNumberPref;
+
   const [primaryCatalogNumber, setPrimaryCatalogNumber] = React.useState<
     string | null
   >(null);
 
+  const [parentCatalogNumber, setParentCatalogNumber] = React.useState<
+    string | null
+  >(null);
+
   React.useEffect(() => {
-    if (resource && displayCatNumberPlaceHolder) {
+    if (resource && displayPrimaryCatNumberPlaceHolder) {
       ajax<string | null>('/api/specify/catalog_number_for_sibling/', {
         method: 'POST',
         headers: { Accept: 'application/json' },
@@ -162,18 +189,38 @@ function Field({
         .catch((error) => {
           console.error('Error fetching catalog number:', error);
         });
+    } else if (resource && displayParentCatNumberPlaceHolder) {
+      ajax<string | null>('/api/specify/catalog_number_from_parent/', {
+        method: 'POST',
+        headers: { Accept: 'application/json' },
+        body: resource,
+      })
+        .then((response) => {
+          setParentCatalogNumber(response.data);
+        })
+        .catch((error) => {
+          console.error('Error fetching catalog number:', error);
+        });
     }
-  }, [resource, displayCatNumberPlaceHolder]);
+  }, [
+    resource,
+    displayPrimaryCatNumberPlaceHolder,
+    displayParentCatNumberPlaceHolder,
+  ]);
 
   return (
     <Input.Generic
       forwardRef={validationRef}
       key={parser.title}
       name={name}
       placeholder={
-        displayCatNumberPlaceHolder && typeof primaryCatalogNumber === 'string'
+        displayPrimaryCatNumberPlaceHolder &&
+        typeof primaryCatalogNumber === 'string'
           ? primaryCatalogNumber
-          : undefined
+          : displayParentCatNumberPlaceHolder &&
+              typeof parentCatalogNumber === 'string'
+            ? parentCatalogNumber
+            : undefined
       }
       {...validationAttributes}
       className={

specifyweb/frontend/js_src/lib/components/Preferences/CollectionDefinitions.tsx

@@ -108,6 +108,25 @@ export const collectionPreferenceDefinitions = {
       },
     },
   },
+  catalogNumberParentInheritance: {
+    title: queryText.catalogNumberParentCOInheritance(),
+    subCategories: {
+      behavior: {
+        title: preferencesText.behavior(),
+        items: {
+          inheritance: definePref<boolean>({
+            title: preferencesText.inheritanceCatNumberParentCOPref(),
+            requiresReload: false,
+            visible: false,
+            defaultValue: false,
+            renderer: f.never,
+            container: 'label',
+            type: 'java.lang.Boolean',
+          }),
+        },
+      },
+    },
+  },
 } as const;
 
 ensure<GenericPreferences>()(collectionPreferenceDefinitions);

specifyweb/frontend/js_src/lib/localization/preferences.ts

@@ -2022,4 +2022,9 @@ export const preferencesText = createDictionary({
     'en-us':
       'Enable the inheritance of the primary catalog number to its empty siblings.',
   },
+  inheritanceCatNumberParentCOPref: {
+    // TODO: improve
+    'en-us':
+      'Enable the inheritance of the parent catalog number to its empty children.',
+  },
 } as const);

specifyweb/frontend/js_src/lib/localization/query.ts

@@ -905,6 +905,9 @@ export const queryText = createDictionary({
   catalogNumberInheritance: {
     'en-us': 'Catalog Number Inheritance',
   },
+  catalogNumberParentCOInheritance: {
+    'en-us': 'Catalog Number Parent Collection Object Inheritance',
+  },
   formatInputAs: {
     comment: `
       Used to indicate a text field will be formatted with a specific format.

specifyweb/frontend/js_src/lib/localization/resources.ts

@@ -871,4 +871,7 @@ export const resourcesText = createDictionary({
     'en-us':
       'Determination does not belong to the taxon tree associated with the Collection Object Type',
   },
+  preparationUsedInLoan: {
+    'en-us': 'The preparation is used in a loan.',
+  },
 } as const);

specifyweb/interactions/cog_preps.py

@@ -530,6 +530,16 @@ def modify_update_of_loan_return_sibling_preps(original_interaction_obj, updated
     for loan_prep_idx in range(len(updated_interaction_data["loanpreparations"])):
         if type(updated_interaction_data["loanpreparations"]) is str:
             continue
+
+        loan_preps = updated_interaction_data.get("loanpreparations")
+        # Skip if loan_preps is not a list or index is out of range
+        if not isinstance(loan_preps, list) or loan_prep_idx >= len(loan_preps):
+            continue
+
+        loan_prep = loan_preps[loan_prep_idx]
+        if not isinstance(loan_prep, dict):
+            continue
+
         loan_return_data = (
             updated_interaction_data["loanpreparations"][loan_prep_idx][
                 "loanreturnpreparations"

specifyweb/specify/urls.py

@@ -14,7 +14,10 @@
     re_path(r'^specify/merge/abort/(?P<merge_id>[0-9a-fA-F-]+)/$', views.abort_merge_task),
 
     # cat num for siblings
-    re_path(r'^specify/catalog_number_for_sibling/(?P<model>\w+)/(?P<id>\d+)/$', views.catalog_number_for_sibling),
+    re_path(r'^specify/catalog_number_for_sibling/$', views.catalog_number_for_sibling),
+
+    # cat num for parent
+    re_path(r'^specify/catalog_number_from_parent/$', views.catalog_number_from_parent), 
 
     # the main business data API
     re_path(r'^specify_schema/openapi.json$', schema.openapi),

specifyweb/specify/utils.py

@@ -129,4 +129,33 @@ def get_cat_num_inheritance_setting(collection, user) -> bool:
     except Exception as e:
         logger.warning(f"An unexpected error occurred: {e}")
 
-    return inheritance_enabled
+    return inheritance_enabled
+
+def get_parent_cat_num_inheritance_setting(collection, user) -> bool:
+    import specifyweb.context.app_resource as app_resource
+
+    parent_inheritance_enabled: bool = False  
+
+    try:
+        collection_prefs_json, _, __ = app_resource.get_app_resource(collection, user, 'CollectionPreferences')
+
+        if collection_prefs_json is not None:
+            collection_prefs_dict = json.loads(collection_prefs_json)
+
+            catalog_number_parent_inheritance = collection_prefs_dict.get('catalogNumberParentInheritance', {})
+            behavior = catalog_number_parent_inheritance.get('behavior', {}) \
+                if isinstance(catalog_number_parent_inheritance, dict) else {}
+            parent_inheritance_enabled = behavior.get('inheritance', False) if isinstance(behavior, dict) else False
+
+            if not isinstance(parent_inheritance_enabled, bool):
+                parent_inheritance_enabled = False
+
+    except json.JSONDecodeError:
+        logger.warning(f"Error: Could not decode JSON for collection preferences")
+    except TypeError as e:
+        logger.warning(f"Error: Unexpected data structure in collection preferences: {e}")
+    except Exception as e:
+        logger.warning(f"An unexpected error occurred: {e}")
+    
+    return parent_inheritance_enabled
+

specifyweb/specify/views.py

@@ -1412,4 +1412,40 @@ def catalog_number_for_sibling(request: http.HttpRequest):
 
     except Exception as e:
         print(f"Error processing request: {e}")
-        return http.JsonResponse({'error': 'An internal server error occurred.'}, status=500)
+        return http.JsonResponse({'error': 'An internal server error occurred.'}, status=500)                  
+                                
+
+@login_maybe_required
+@require_POST
+def catalog_number_from_parent(request: http.HttpRequest):
+    """
+    Returns the catalog number of the parent CO
+    """
+    try:
+        request_data = json.loads(request.body)
+        object_id = request_data.get('id')
+        provided_catalog_number = request_data.get('catalognumber')
+    except json.JSONDecodeError:
+        return http.JsonResponse({'error': 'Invalid JSON body.'}, status=400)
+
+    if object_id is None:
+        return http.JsonResponse({'error': "'id' field is required."}, status=400)
+
+    if provided_catalog_number is not None:
+        return http.JsonResponse(None, safe=False)
+
+    try:
+        # Get the child CO
+        child = spmodels.Collectionobject.objects.get(id=object_id)
+
+        # Get the parent CO
+        parent = child.parentco
+
+        if parent and parent.catalognumber:
+            return http.JsonResponse(parent.catalognumber, safe=False)
+        else:
+            return http.JsonResponse({'error': 'Parent or parent catalog number not found.'}, status=404)
+
+    except Exception as e:
+        print(f"Error processing request: {e}")
+        return http.JsonResponse({'error': 'An internal server error occurred.'}, status=500)