This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, main has been updated via d6f4414afb5237cddc3f659b2ae633c1f688851b (commit) from 2822019f45d5ce6c0b7e1340503d2aaba1b39e27 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d6f4414afb5237cddc3f659b2ae633c1f688851b Author: Mike Rylander <mrylander@gmail.com> Date: Thu Apr 10 15:41:00 2025 -0400 LP#2092695: Add field info to report template table aliases When calculating the alias to use for a table in a report, we need to include the linking column names to disambiguate which "version" of the joined table we're passing through in a particular join path. This commit does that whenever there is column-level data available. To test: 1) Create a template starting from the Hold Transit source that displays the Shortname of the Sending Library AND the Destination Library. See that the template cause an error when run. 2) Apply this patch, and then clone the template from (1). See that the report runs correctly. NOTE: To fix templates without having to clone them and then clean up the old ones, you can choose the Clone action on the template, change the URL path component from "clone" to "edit" once it loads, and then save the template. The join aliases are calculated when the template is saved, so this will repair the template in place. Release-note: Fix report table alias calculation for joins Signed-off-by: Mike Rylander <mrylander@gmail.com> Signed-off-by: Galen Charlton <gmc@equinoxOLI.org> diff --git a/Open-ILS/src/eg2/src/app/staff/reporter/share/reporter.service.ts b/Open-ILS/src/eg2/src/app/staff/reporter/share/reporter.service.ts index c19ec2078a..c7cf9a37ac 100644 --- a/Open-ILS/src/eg2/src/app/staff/reporter/share/reporter.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/reporter/share/reporter.service.ts @@ -1509,6 +1509,9 @@ export class ReporterService { pathHash += ' -> '; if (n.stateFlag) {pathHash += ' [Required]';} } + if (n.callerData.fmField?.name) { + pathHash += n.callerData.fmField.name + '.'; + } pathHash += n.callerData.fmClass; }); return Md5.hashStr(pathHash); ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/app/staff/reporter/share/reporter.service.ts | 3 +++ 1 file changed, 3 insertions(+) hooks/post-receive -- Evergreen ILS