[4.3] MSPB-73: dont rely on profile name, add explicit video flag (#105)

submodules/conference/conference.js

@@ -198,7 +198,7 @@ define(function(require) {
 						member: {},
 						play_entry_tone: true,
 						play_exit_tone: true,
-						enable_video_conferencing: false
+						video: false
 					}, data_defaults || {}),
 					field_data: {
 						users: []
@@ -248,8 +248,6 @@ define(function(require) {
 					render_data = $.extend(true, defaults, { data: results.get_conference });
 				}
 
-				render_data.data.enable_video_conferencing = _.has(render_data, 'data.profile_name');
-
 				self.conferenceRender(render_data, target, callbacks);
 
 				if (typeof callbacks.after_render === 'function') {
@@ -562,20 +560,20 @@ define(function(require) {
 			delete data.conference_numbers_string;
 
 			// Set conferencing video settings
-			if (data.enable_video_conferencing) {
+			if (data.video) {
 				data = _.merge(data, {
+					video: true,
 					profile_name: 'video',
 					caller_controls: 'video-participant',
 					moderator_controls: 'video-moderator'
 				});
 			} else {
+				delete data.video;
 				delete data.profile_name;
 				delete data.caller_controls;
 				delete data.moderator_controls;
 			}
 
-			delete data.enable_video_conferencing;
-
 			return data;
 		},
 

submodules/conference/views/edit.html

@@ -117,7 +117,7 @@ <h1>{{#if data.id}}{{ i18n.callflows.conference.edit_conference }}{{else}}{{ i18
 							<ul class="inputs-list">
 								<li>
 									<label>
-										<input type="checkbox" id="enable_video_conferencing" name="enable_video_conferencing"{{#if data.enable_video_conferencing}} checked="checked"{{/if}} />
+										<input type="checkbox" id="video" name="video"{{#if data.video}} checked="checked"{{/if}} />
 										<span>{{ i18n.callflows.conference.enableVideoConferencing }}</span>
 									</label>
 								</li>