Skip to content

[bot] Merge 25.7 to 25.8 #1014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
github-actions merged 4 commits into from
Aug 19, 2025
Merged

[bot] Merge 25.7 to 25.8 #1014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
26555f1
trim spaces on eventDataNarrative attribute brackets (#1010)
jallentxbiomed Aug 13, 2025
109350e
Merge 25.3 to 25.7
labkey-teamcity Aug 18, 2025
a648590
Cage class extensible (#1008)
labkey-martyp Aug 18, 2025
921ae24
Merge 25.7 to 25.8
labkey-teamcity Aug 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ehr/resources/queries/study/demographicsMostRecentWeight.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ null as weightField,
cast((
SELECT round(cast(AVG(w2.weight) as double), 2) AS _expr
FROM study.weight w2
WHERE w.id=w2.id AND w.MostRecentWeightDate=w2.date
WHERE w2.qcstate.publicdata = true AND w.id=w2.id AND w.MostRecentWeightDate=w2.date
) as double) AS MostRecentWeight

FROM (
Expand Down
1 change: 1 addition & 0 deletions ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-25.001-25.002.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE ehr_lookups.cageclass ADD COLUMN LSID LSIDtype;
1 change: 1 addition & 0 deletions ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-25.001-25.002.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE ehr_lookups.cageclass ADD Lsid LsidType null;
11 changes: 11 additions & 0 deletions ehr/resources/schemas/ehr_lookups.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,17 @@
<fkColumnName>entityid</fkColumnName>
</fk>
</column>
<column columnName="lsid">
<datatype>lsidtype</datatype>
<isReadOnly>true</isReadOnly>
<isHidden>true</isHidden>
<isUserEditable>false</isUserEditable>
<fk>
<fkColumnName>ObjectUri</fkColumnName>
<fkTable>Object</fkTable>
<fkDbSchema>exp</fkDbSchema>
</fk>
</column>
</columns>
</table>
<table tableName="conc_units" tableDbType="TABLE" useColumnOrder="true">
Expand Down
2 changes: 1 addition & 1 deletion ehr/src/org/labkey/ehr/EHRModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public String getName()
@Override
public @Nullable Double getSchemaVersion()
{
return 25.001;
return 25.002;
}

@Override
Expand Down
7 changes: 6 additions & 1 deletion snd/src/org/labkey/snd/SNDManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3420,7 +3420,12 @@ private String generateEventDataNarrative(Container c, User u, Event event, Even
value = "<span class='" + AttributeData.ATTRIBUTE_DATA_CSS_CLASS + "'>" + value + "</span>";
}

eventDataNarrative = new StringBuilder(eventDataNarrative.toString().replace("{" + pd.getName() + "}", value));
// Trim any spaces immediately inside '{' and '}' to make tokens like "{ route 2}" -> "{route 2}"
String normalized = eventDataNarrative.toString()
.replaceAll("\\{\\s+", "{")
.replaceAll("\\s+\\}", "}");

eventDataNarrative = new StringBuilder(normalized.replace("{" + pd.getName() + "}", value));
}
}

Expand Down