Merge changes from release26.3-SNAPSHOT through v7.21.3#1956
Merged
Conversation
…ey where the value contains a comma doesn't map to lookup (#1946)
…e 'Search for Samples' grid when adding samples to a storage location (#1949) ### version 7.21.2 *Released*: 11 March 2026 - GitHub Issue 710: Include columns set as Identifying Fields within the 'Search for Samples' grid when adding samples to a storage location - update saveGridView() to take hidden prop (default false) - saveSettingsToLocalStorage() fix for checking model.useSavedSettings === SavedSettings.none
…/unit input for differing units (#1947) ### version 7.21.3 *Released*: 12 March 2026 - GitHub Issue #790: Sample check-in and discard should not allow amount/unit input for differing units - Update areUnitsCompatible to account for different "Count" unit labels - getMetricUnitOptions() to allow optional filterFn parameter for the "Count" unit case
labkey-alan
approved these changes
Mar 18, 2026
labkey-susanh
approved these changes
Mar 18, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Rationale
v7.21.2: #1949
v7.21.3: #1947