Merge 24.11 to 25.2

LabKey · Feb 11, 2025 · 6ae0538 · 6ae0538
2 parents 9fe727c + 82cbfe7
commit 6ae0538
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/onprc_ehr/resources/web/onprc_ehr/panel/SnapshotPanel.js b/onprc_ehr/resources/web/onprc_ehr/panel/SnapshotPanel.js
@@ -735,8 +735,6 @@ Ext4.define('onprc_ehr.panel.SnapshotPanel', {
 
         toSet['flags'] = values.length ? '<a id="onprcFlagsLink">' + values.join('<br>') + '</div>' : null;
 
-        behavevalues = ['test'];
-
         if (behavevalues.length) {
             toSet['behaviorflag'] = '<a id="onprcBehaviorFlagsLink">' + behavevalues.join('<br>') + '</div>';
         }

diff --git a/sla/resources/queries/sla/ProtocolProjectsUsage.sql b/sla/resources/queries/sla/ProtocolProjectsUsage.sql
@@ -13,7 +13,7 @@ SELECT
     y.grantNumber as OGAGrantNumber,
     y.fiscalAuthorityName As FiscalAuthorityName,
     aa.Species,
-    aa.Gender as Sex,
+    aa.Gender,
     aa.Strain,
     aa.Allowed AS NumAllowed,
     calc.NumUsed,