From 00fb07bb3be7289deb1692caaab54c022a94a7f0 Mon Sep 17 00:00:00 2001
From: vedasole <vedasole001@gmail.com>
Date: Thu, 21 Sep 2023 04:06:57 +0530
Subject: [PATCH] #1269 Resolved the bug to show and send correct {{eventName}}
 for compose message functionality

---
 src/main/java/alfio/manager/support/CustomMessageManager.java   | 2 +-
 .../angular-templates/admin/partials/custom-message/index.html  | 2 +-
 src/main/webapp/resources/js/admin/ng-app/admin-application.js  | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/alfio/manager/support/CustomMessageManager.java b/src/main/java/alfio/manager/support/CustomMessageManager.java
index a6d4d3cbe4..9f53fcd950 100644
--- a/src/main/java/alfio/manager/support/CustomMessageManager.java
+++ b/src/main/java/alfio/manager/support/CustomMessageManager.java
@@ -94,7 +94,7 @@ public void sendMessages(String eventName, Optional<Integer> categoryId, List<Me
                 .parallel()
                 .map(t -> {
                     Model model = new ExtendedModelMap();
-                    model.addAttribute("eventName", eventName);
+                    model.addAttribute("eventName", event.getDisplayName());
                     model.addAttribute("fullName", t.getFullName());
                     model.addAttribute("organizationName", organization.getName());
                     model.addAttribute("organizationEmail", organization.getEmail());
diff --git a/src/main/webapp/resources/angular-templates/admin/partials/custom-message/index.html b/src/main/webapp/resources/angular-templates/admin/partials/custom-message/index.html
index 5341243f3d..552a6256a2 100644
--- a/src/main/webapp/resources/angular-templates/admin/partials/custom-message/index.html
+++ b/src/main/webapp/resources/angular-templates/admin/partials/custom-message/index.html
@@ -12,7 +12,7 @@ <h6>the syntax is defined by <a href="http://mustache.github.io/mustache.5.html"
             <dl class="wMarginTop">
 
                 <dt><span data-uib-tooltip="the name of the event" data-ng-non-bindable>{{eventName}}</span></dt>
-                <dd>{{eventName}}</dd>
+                <dd>{{eventDisplayName}}</dd>
 
                 <dt><span data-uib-tooltip="Either the name of the attendee or the name of the reservation owner" data-ng-non-bindable>{{fullName}}</span></dt>
                 <dd>{{fullName}}</dd>
diff --git a/src/main/webapp/resources/js/admin/ng-app/admin-application.js b/src/main/webapp/resources/js/admin/ng-app/admin-application.js
index 1d3c4ccf57..e1eaddbc73 100644
--- a/src/main/webapp/resources/js/admin/ng-app/admin-application.js
+++ b/src/main/webapp/resources/js/admin/ng-app/admin-application.js
@@ -2171,6 +2171,7 @@
                 var eventDescriptor = results[1].data;
                 $scope.organization = eventDescriptor.organization;
                 $scope.eventName = eventDescriptor.event.shortName;
+                $scope.eventDisplayName = eventDescriptor.event.displayName;
                 $scope.onlineEvent = eventDescriptor.event.online;
         });