nInput_EndPoints: support for attrTemplate using chUrls/chPorts

OpenAF · Aug 10, 2023 · 30f977d · 30f977d
1 parent 2a6a57e
commit 30f977d
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/config/objects/nInput_EndPoints.js b/config/objects/nInput_EndPoints.js
@@ -107,19 +107,22 @@ nInput_EndPoints.prototype.input = function(scope, args) {
     if (isDef(this.params.chUrls)) {
         $ch(this.params.chUrls).forEach((k, v) => {
             var attr;
-            if (isUnDef(this.params.attribute)) {
+            // For legacy compatibility
+            if (isDef(this.params.attribute)) this.params.attrTemplate = this.params.attribute
+            if (isUnDef(this.params.attrTemplate)) {
                 if (isDef(k.key))       attr = k.key;
                 if (isString(k))        attr = k;
                 if (isDef(k.attribute)) attr = k.attribute; 
             } else {
                 if (isDef(k.attribute))
                     attr = k.attribute
                 else
-                    attr = this.params.attribute
+                    attr = this.params.attrTemplate
             }
 
             if (isDef(attr)) {
-                ret[templify(attr, k)] = this.testURL(v);
+                if (isUnDef(ret[templify(attr, k)])) ret[templify(attr, k)] = []
+                ret[templify(attr, k)].push(this.testURL(v))
             }
         });
     }
@@ -134,21 +137,24 @@ nInput_EndPoints.prototype.input = function(scope, args) {
     if (isDef(this.params.chPorts)) {
         $ch(this.params.chPorts).forEach((k, v) => {
             var attr;
-            if (isUnDef(this.params.attribute)) {
+            // For legacy compatibility
+            if (isDef(this.params.attribute)) this.params.attrTemplate = this.params.attribute
+            if (isUnDef(this.params.attrTemplate)) {
                 if (isDef(k.key))       attr = k.key;
                 if (isString(k))        attr = k;
                 if (isDef(k.attribute)) attr = k.attribute;
             } else {
                 if (isDef(k.attribute))
                     attr = k.attribute
                 else
-                    attr = this.params.attribute
+                    attr = this.params.attrTemplate
             }
 
             if (isDef(attr)) {
-                ret[templify(attr, k)] = this.testPort(v);
+                if (isUnDef(ret[templify(attr, k)])) ret[templify(attr, k)] = []
+                ret[templify(attr, k)].push(this.testPort(v))
             }
-        });
+        })
     }
 
     return ret;