Skip to content

Trim spaces on SND Narrative attribute tokens #1010

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
jallentxbiomed merged 1 commit into from
Aug 13, 2025
Merged

Trim spaces on SND Narrative attribute tokens #1010

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
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 @@ -3457,7 +3457,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