SAK-29536

Feedback Tool - The contact name uses a different property
chundcm · Jun 26, 2015 · 2e08648 · 2e08648
1 parent e2049dc
commit 2e08648
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/feedback/src/java/org/sakaiproject/feedback/tool/FeedbackTool.java b/feedback/src/java/org/sakaiproject/feedback/tool/FeedbackTool.java
@@ -90,9 +90,9 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
             addRecipients(site, emailRecipients, siteUpdaters, serviceName);
         }
         else {
-            String serviceContectName = rb.getFormattedMessage("technical_team_name", new String[]{serviceName});
+            String serviceContactName = rb.getFormattedMessage("technical_team_name", new String[]{serviceName});
             String serviceContactEmail = sakaiProxy.getConfigString(Constants.PROP_TECHNICAL_ADDRESS, null);
-            emailRecipients.put(serviceContactEmail, serviceContectName);
+            emailRecipients.put(serviceContactEmail, serviceContactName);
         }
 
         if (userId != null) {
@@ -136,8 +136,9 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
             contactName = site.getProperties().getProperty(Site.PROP_SITE_CONTACT_NAME);
         }
         else if (!hasViewPermission){
-            contactName = rb.getFormattedMessage("technical_team_name", new String[]{serviceName})
-                    + " <" + sakaiProxy.getConfigString("mail.support", "") + ">";
+            String serviceContactName = rb.getFormattedMessage("technical_team_name", new String[]{serviceName});
+            String serviceContactEmail = sakaiProxy.getConfigString(Constants.PROP_TECHNICAL_ADDRESS, null);
+            contactName = String.format("%s <%s>" ,serviceContactName, serviceContactEmail);
         }
         setStringAttribute(request, "contactName", contactName);