From e0572aacb5cffe260273f5544ffcbaed81fb5cbf Mon Sep 17 00:00:00 2001
From: Ricardo Merino <masmerino@gmail.com>
Date: Thu, 29 Nov 2018 09:14:02 -0600
Subject: [PATCH] UI-3265: Fix rename groups issue (#105)

* Remove this

* Dont escape groups title
Use template string for group creation also

* Revert "Remove this"

This reverts commit 7102cf9b4a087321ac2d8ac7dc2b97a44311ed18.
---
 i18n/en-US.json             |  4 ++--
 submodules/groups/groups.js | 17 ++++++++++++++---
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/i18n/en-US.json b/i18n/en-US.json
index e0407a5..4dd1a7e 100644
--- a/i18n/en-US.json
+++ b/i18n/en-US.json
@@ -150,8 +150,8 @@
 		"__comment": "UI-2104: Adding a warning when adding a group with no endpoints",
 		"__version": "3.22",
 		"emptyEndpointsWarning": "You need to select at least one member to create a group",
-		"ringGroup": "{{name}} Ring Group",
-		"baseGroup": "{{name}} Base Group"
+		"ringGroup": "{{{name}}} Ring Group",
+		"baseGroup": "{{{name}}} Base Group"
 	},
 
 	"devices": {
diff --git a/submodules/groups/groups.js b/submodules/groups/groups.js
index 6650c80..2c87159 100644
--- a/submodules/groups/groups.js
+++ b/submodules/groups/groups.js
@@ -350,7 +350,8 @@ define(function(require) {
 		},
 
 		groupsCreationMergeData: function(data, template) {
-			var formData = monster.ui.getFormData('form_group_creation'),
+			var self = this,
+				formData = monster.ui.getFormData('form_group_creation'),
 				fixedTimeout = '20',
 				fixedDelay = '0',
 				settings = {
@@ -376,7 +377,12 @@ define(function(require) {
 				},
 				baseCallflow: {
 					numbers: [ monster.util.randomString(25) ],
-					name: formData.name + ' Base Group',
+					name: self.getTemplate({
+						name: '!' + self.i18n.active().groups.baseGroup,
+						data: {
+							name: formData.name
+						}
+					}),
 					flow: {
 						module: 'ring_group',
 						children: {},
@@ -390,7 +396,12 @@ define(function(require) {
 				},
 				callflow: {
 					numbers: [ formData.extra.extension ],
-					name: formData.name + ' Ring Group',
+					name: self.getTemplate({
+						name: '!' + self.i18n.active().groups.ringGroup,
+						data: {
+							name: formData.name
+						}
+					}),
 					flow: {
 						module: 'callflow',
 						children: {