Merge branch 'patch-uncol-sa-admin-domain' into 'master'

field biosseg_floating_parent_segment fixed

See merge request noc/noc!4216

ui/web/core/ModelApplication.js

@@ -1042,6 +1042,10 @@ Ext.define("NOC.core.ModelApplication", {
                 // WARNING: Will skip other inline editors
                 continue;
             }
+            if(!Ext.isFunction(field.getModelData)){
+                // Skip fields without data, e.g. FieldSet
+                continue;
+            }
             data = field.getModelData();
             if(Ext.isObject(data)) {
                 name = field.getName();

ui/web/sa/administrativedomain/Application.js

@@ -14,7 +14,6 @@ Ext.define("NOC.sa.administrativedomain.Application", {
         "NOC.sa.administrativedomain.Model",
         "NOC.main.pool.LookupField",
         "NOC.main.template.LookupField",
-        "NOC.inv.networksegment.TreeCombo",
         "NOC.main.remotesystem.LookupField"
     ],
     model: "NOC.sa.administrativedomain.Model",
@@ -94,8 +93,9 @@ Ext.define("NOC.sa.administrativedomain.Application", {
                     allowBlank: true
                 },
                 {
+                    xtype: "noc.core.combotree",
+                    restUrl: "/inv/networksegment/",
                     name: "bioseg_floating_parent_segment",
-                    xtype: "inv.networksegment.TreeCombo",
                     fieldLabel: __("Floating Parent Segment"),
                     allowBlank: true
                 }