Merge "Hidden sub interface section and disabled vlanid for port edit"

Juniper · Jan 23, 2017 · 06fb794 · 06fb794
2 parents bc6094a + 1afc888
commit 06fb794
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/webroot/config/networking/port/ui/js/models/portModel.js b/webroot/config/networking/port/ui/js/models/portModel.js
@@ -469,12 +469,9 @@ define([
                     modelConfig["disable_sub_interface"] = true;
                 }
             }
-            if(vlanTag == ""){
-                var vmiRefTo = getValueByJsonPath(modelConfig,
-                                    "virtual_machine_interface_refs",[]);
-                if (vmiRefTo.length > 0) {
-                    modelConfig['isParent'] = true;
-                }
+            var portUUID = getValueByJsonPath(modelConfig, "uuid", null);
+            if(vlanTag == "" && portUUID != null) {
+                modelConfig['isParent'] = true;
             }
             modelConfig['deviceOwnerValue'] = deviceOwnerValue;
 

diff --git a/webroot/config/networking/port/ui/js/portViewConfigs.js b/webroot/config/networking/port/ui/js/portViewConfigs.js
@@ -557,6 +557,7 @@
                                      viewConfig: {
                                          visible: "is_sub_interface",
                                          placeholder: 'Specify VLAN',
+                                         disabled: isDisable,
                                          path: 'virtual_machine_interface_properties.sub_interface_vlan_tag',
                                          dataBindValue: 'virtual_machine_interface_properties().sub_interface_vlan_tag',
                                          class: "col-xs-6",