Skip to content

DT-3091: Update freemarker template accessors for record model class #2832

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
rushtong merged 2 commits into from
Mar 18, 2026
Merged

DT-3091: Update freemarker template accessors for record model class #2832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
794e140
fix: use parens to force freemarker method access
rushtong Mar 17, 2026
097b647
fix: drive-by conversion to freemarker template extension
rushtong Mar 18, 2026
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
4 changes: 2 additions & 2 deletions src/main/java/org/broadinstitute/consent/http/enumeration/EmailType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public enum EmailType {
NEW_DAR(4, "new-request.html"),
DISABLED_DATASET(5),
CLOSED_DATASET_ELECTION(6),
DATA_CUSTODIAN_APPROVAL(7, "data-custodian-approval.html"),
DATA_CUSTODIAN_APPROVAL(7, "data-custodian-approval.ftl"),
RESEARCHER_DAR_APPROVED(8, "researcher-dar-approved.ftl"),
ADMIN_FLAGGED_DAR_APPROVED(9),
DAR_CANCEL(10),
Expand All @@ -32,7 +32,7 @@ public enum EmailType {
SO_DAR_APPROVED(29, "so-dar-approved.html"),
SO_PROGRESS_REPORT_SUBMITTED(30, "so-progress-report-submitted.html"),
SO_PROGRESS_REPORT_APPROVED(31, "so-progress-report-approved.html"),
DAC_RADAR_APPROVED(32, "dac-radar-approved.html"),
DAC_RADAR_APPROVED(32, "dac-radar-approved.ftl"),
NEW_DAR_SO_NEEDS_TO_APPROVE(33, "new-dar-so-needs-to-approve.html"),
DAC_VOTE_REMINDER_DIGEST(34, "vote-digest.ftl"),
NEW_STUDY_REGISTRATION_CONFIRMATION(35, "new-study-registration-confirmation.ftl");
Expand Down
4 changes: 2 additions & 2 deletions ...ources/freemarker/dac-radar-approved.html → ...sources/freemarker/dac-radar-approved.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@
<#items as dataset>
<tr>
<td style="font-family: 'Montserrat', sans-serif; padding: 5px; border-bottom: 1px solid #cccccc;">
${dataset.identifier}
${dataset.identifier()}
</td>
<td style="font-family: 'Montserrat', sans-serif; padding: 5px; border-bottom: 1px solid #cccccc;">
${dataset.name}
${dataset.name()}
</td>
</tr>
</#items>
Expand Down
4 changes: 2 additions & 2 deletions ...s/freemarker/data-custodian-approval.html → ...es/freemarker/data-custodian-approval.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
<#items as dataset>
<tr>
<td style="font-family: 'Montserrat', sans-serif; padding: 5px; border-bottom: 1px solid #cccccc;">
${dataset.identifier}
${dataset.identifier()}
</td>
<td style="font-family: 'Montserrat', sans-serif; padding: 5px; border-bottom: 1px solid #cccccc;">
${dataset.name}
${dataset.name()}
</td>
</tr>
</#items>
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/freemarker/researcher-dar-approved.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@
<#items as dataset>
<tr>
<td style="font-family: 'Montserrat', sans-serif; padding: 5px; border-bottom: 1px solid #cccccc;">
${dataset.identifier}
${dataset.identifier()}
</td>
<td style="font-family: 'Montserrat', sans-serif; padding: 5px; border-bottom: 1px solid #cccccc;">
${dataset.name}
${dataset.name()}
</td>
<td style="font-family: 'Montserrat', sans-serif; padding: 5px; border-bottom: 1px solid #cccccc;">
<#if (dataset.dataLocationUrl)??>
<a href="${dataset.dataLocationUrl}" style="text-decoration: none; font-family: 'Montserrat', sans-serif; color: #00609F;">${dataset.dataLocationUrl}</a>
<#if (dataset.dataLocationUrl())??>
<a href="${dataset.dataLocationUrl()}" style="text-decoration: none; font-family: 'Montserrat', sans-serif; color: #00609F;">${dataset.dataLocationUrl()}</a>
</#if>
</td>
</tr>
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/freemarker/researcher-progress-report-approved.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@
<#items as dataset>
<tr>
<td style="font-family: 'Montserrat', sans-serif; padding: 5px; border-bottom: 1px solid #cccccc;">
${dataset.identifier}
${dataset.identifier()}
</td>
<td style="font-family: 'Montserrat', sans-serif; padding: 5px; border-bottom: 1px solid #cccccc;">
${dataset.name}
${dataset.name()}
</td>
<td style="font-family: 'Montserrat', sans-serif; padding: 5px; border-bottom: 1px solid #cccccc;">
<#if (dataset.dataLocationUrl)??>
<a href="${dataset.dataLocationUrl}" style="text-decoration: none; font-family: 'Montserrat', sans-serif; color: #00609F;">${dataset.dataLocationUrl}</a>
<#if (dataset.dataLocationUrl())??>
<a href="${dataset.dataLocationUrl()}" style="text-decoration: none; font-family: 'Montserrat', sans-serif; color: #00609F;">${dataset.dataLocationUrl()}</a>
</#if>
</td>
</tr>
Expand Down
Loading