diff --git a/web/assets/js/bs5.monitorSettings.js b/web/assets/js/bs5.monitorSettings.js index 8c7cf6bb..746e4388 100644 --- a/web/assets/js/bs5.monitorSettings.js +++ b/web/assets/js/bs5.monitorSettings.js @@ -286,6 +286,14 @@ function getMonitorGroupsSelected(){ }) return monitorGroupsInSelection } +function getMonitorTriggerGroupsSelected(){ + var monitorGroupsInSelection = [] + monitorEditorWindow.find('[group_detector_multi]:checked').each(function(n,v){ + var monitorId = $(v).val() + monitorGroupsInSelection.push(monitorId) + }) + return monitorGroupsInSelection +} var differentiateMonitorConfig = function(firstConfig,secondConfig){ console.log(firstConfig,secondConfig) var diffedConfig = {} @@ -407,6 +415,7 @@ window.getMonitorEditFormFields = function(){ monitorConfig.details = safeJsonParse(monitorConfig.details) monitorConfig.details.substream = getSubStreamChannelFields() monitorConfig.details.groups = getMonitorGroupsSelected() + monitorConfig.details.group_detector_multi = getMonitorTriggerGroupsSelected() monitorConfig.details.input_map_choices = monitorSectionInputMapsave() // TODO : Input Maps and Stream Channels (does old way at the moment) @@ -648,7 +657,7 @@ function importIntoMonitorEditor(options){ ${v.name} (${v.id})
- +
` @@ -974,15 +983,6 @@ monitorEditorWindow.on('change','[groups]',function(){ }); monitorEditorWindow.find('[detail="groups"]').val(JSON.stringify(selectedGroups)).change() }) -monitorEditorWindow.on('change','[group_detector_multi]',function(){ - var e={}; - var el = monitorEditorWindow.find('[group_detector_multi]:checked'); - var selectedMultiTrigger=[]; - el.each(function(n,v){ - selectedMultiTrigger.push($(v).val()) - }); - monitorEditorWindow.find('[detail="group_detector_multi"]').val(JSON.stringify(selectedMultiTrigger)).change() -}) monitorEditorWindow.on('change','.detector_cascade_selection',function(){ var e={}; var el = monitorEditorWindow.find('.detector_cascade_selection:checked'); @@ -1166,7 +1166,7 @@ editorForm.find('[name="type"]').change(function(e){ ${hasSelectedMonitor ? `` : ''}
- +