From 62a8b72dc40449e9d761cb2c46d92fa2cb2efee5 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 30 Aug 2022 20:03:55 +0200
Subject: [PATCH] Fix add monitorlink to not prepend a | onto and empty expr

---
 web/js/MonitorLinkExpression.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/web/js/MonitorLinkExpression.js b/web/js/MonitorLinkExpression.js
index a9e487b07..b904395eb 100644
--- a/web/js/MonitorLinkExpression.js
+++ b/web/js/MonitorLinkExpression.js
@@ -159,7 +159,7 @@ function expr_to_ui(expr, container) {
   for (monitor_id in monitors) {
     const monitor = monitors[monitor_id];
     //if (!array_search(monitor.Id, used_monitorlinks)) {
-      //select.append('<option value="' + monitor.Id + '">' + monitor.Name + ' : All Zones</option>');
+      select.append('<option value="' + monitor.Id + '">' + monitor.Name + ' : All Zones</option>');
     //}
     for ( zone_id in zones ) {
       const zone = zones[zone_id];
@@ -182,8 +182,10 @@ function array_search(needle, haystack) {
 }
 
 function add_to_expr() {
-  $j('[name="newMonitor[LinkedMonitors]"]').val($j('[name="newMonitor[LinkedMonitors]"]').val() + '|' + $j('#monitorLinks').val());
-  expr_to_ui($j('[name="newMonitor[LinkedMonitors]"]').val(), $j('#LinkedMonitorsUI'));
+  const expr = $j('[name="newMonitor[LinkedMonitors]"]');
+  const oldval = expr.val();
+  expr.val(oldval == '' ? $j('#monitorLinks').val() : oldval + '|' + $j('#monitorLinks').val());
+  expr_to_ui(expr.val(), $j('#LinkedMonitorsUI'));
 }
 
 function update_expr(ev) {