From 65363d90206ac55fb032fea713a222530ab8c7fb Mon Sep 17 00:00:00 2001
From: bitbashing <bitbashing@gmail.com>
Date: Mon, 27 Apr 2020 13:45:13 -0700
Subject: [PATCH] [4.3] MSPB-73: dont rely on profile name, add explicit video
 flag (#194)

* [4.3] MSPB-73: dont rely on profile name, add explicit video flag

* MSPB-73: remove unnecessary function
---
 submodules/users/users.js                        | 13 +++----------
 submodules/users/views/feature-conferencing.html |  2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/submodules/users/users.js b/submodules/users/users.js
index 00eee15..5d33929 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -2071,7 +2071,6 @@ define(function(require) {
 
 		usersRenderConferencing: function(data) {
 			var self = this,
-				data = self.usersFormatConferencingData(data),
 				featureTemplate = $(self.getTemplate({
 					name: 'feature-conferencing',
 					data: data,
@@ -2102,20 +2101,20 @@ define(function(require) {
 				if (monster.ui.valid(featureForm)) {
 					data.conference = monster.ui.getFormData('conferencing_form');
 
-					if (data.conference.enable_video_conferencing) {
+					if (data.conference.video) {
 						data.conference = _.merge(data.conference, {
+							video: true,
 							profile_name: 'video',
 							caller_controls: 'video-participant',
 							moderator_controls: 'video-moderator'
 						});
 					} else {
+						delete data.conference.video;
 						delete data.conference.profile_name;
 						delete data.conference.caller_controls;
 						delete data.conference.moderator_controls;
 					}
 
-					delete data.conference.enable_video_conferencing;
-
 					if (switchFeature.prop('checked')) {
 						self.usersUpdateConferencing(data, function(data) {
 							args.userId = data.user.id;
@@ -2138,12 +2137,6 @@ define(function(require) {
 			});
 		},
 
-		usersFormatConferencingData: function(data) {
-			data.conference.enable_video_conferencing = _.has(data, 'conference.profile_name');
-
-			return data;
-		},
-
 		usersRenderFaxboxes: function(data) {
 			var self = this,
 				data = self.usersFormatFaxingData(data),
diff --git a/submodules/users/views/feature-conferencing.html b/submodules/users/views/feature-conferencing.html
index a5af9a5..394698b 100644
--- a/submodules/users/views/feature-conferencing.html
+++ b/submodules/users/views/feature-conferencing.html
@@ -34,7 +34,7 @@
 			<div class="control-group main">
 				<label class="title">{{i18n.users.conferencing.enableVideoConferencing}}</label>
 				{{#monsterSwitch}}
-					<input type="checkbox" name="enable_video_conferencing" id="enable_video_conferencing" data-on="{{i18n.enabled}}" data-off="{{i18n.disabled}}"{{#if conference.enable_video_conferencing}} checked="checked"{{/if}}></input>
+					<input type="checkbox" name="video" id="video" data-on="{{i18n.enabled}}" data-off="{{i18n.disabled}}"{{#if conference.video}} checked="checked"{{/if}}></input>
 				{{/monsterSwitch}}
 			</div>
 		</form>