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, rel_3_13 has been updated via 43bdf904a6af6d631014f9301628a5dd974f808d (commit) from 7c994436d777e30c5e73a5476ca0e1fd739b87ac (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 43bdf904a6af6d631014f9301628a5dd974f808d 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 f34775b063..5e14aa73f9 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 @@ -1501,6 +1501,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