Преглед изворни кода

Merge pull request #15152 from GordonSmith/HPCC-26175-LZFilter

HPCC-26175 Landing Zone Filter Not Working

Reviewed-By: Jeremy Clements <jeremy.clements@lexisnexisrisk.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman пре 3 година
родитељ
комит
89d1305215
2 измењених фајлова са 3 додато и 3 уклоњено
  1. 1 1
      esp/src/eclwatch/LZBrowseWidget.js
  2. 2 2
      esp/src/eclwatch/TargetSelectClass.js

+ 1 - 1
esp/src/eclwatch/LZBrowseWidget.js

@@ -141,7 +141,7 @@ define([
 
             this.dropZoneTarget2Select.on("change", function (evt) {
                 if (evt) {
-                    context.serverFilterSelect.loadDropZoneMachines(evt);
+                    context.serverFilterSelect.loadDropZoneMachines(evt, true);
                 }
             });
         },

+ 2 - 2
esp/src/eclwatch/TargetSelectClass.js

@@ -328,7 +328,7 @@ define([
             });
         },
 
-        loadDropZoneMachines: function (Name) {
+        loadDropZoneMachines: function (Name, useConfig) {
             var context = this;
             this.set("disabled", true);
             if (Name) {
@@ -349,7 +349,7 @@ define([
                             for (var i = 0; i < targetData.length; ++i) {
                                 context.options.push({
                                     label: targetData[i].Netaddress,
-                                    value: targetData[i].Netaddress
+                                    value: useConfig ? targetData[i].ConfigNetaddress : targetData[i].Netaddress
                                 });
                             }
                             context._postLoad();