You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/04/25 01:03:33 UTC
[25/42] git commit: updated refs/heads/ui-vm-affinity to 25f2f0f
CLOUDSTACK-2151:Vlan values in the UI Detail view are not updated properly
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4b7fe3bc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4b7fe3bc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4b7fe3bc
Branch: refs/heads/ui-vm-affinity
Commit: 4b7fe3bc29ae847ca9622bf9df5860169f8622f0
Parents: fa7049a
Author: Pranav Saxena <pr...@citrix.com>
Authored: Wed Apr 24 14:21:39 2013 +0530
Committer: Pranav Saxena <pr...@citrix.com>
Committed: Wed Apr 24 14:21:39 2013 +0530
----------------------------------------------------------------------
ui/scripts/system.js | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4b7fe3bc/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index b2bd42b..50dd66d 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -1110,23 +1110,24 @@
preFilter: function(args) {
var hiddenFields = [];
if(selectedZoneObj.networktype == "Basic") {
- hiddenFields.push("startVlan");
- hiddenFields.push("endVlan");
+ hiddenFields.push("vlan");
+ // hiddenFields.push("endVlan");
}
return hiddenFields;
},
fields: [
{ //updatePhysicalNetwork API
state: { label: 'label.state' },
- startVlan: {
- label: 'label.start.vlan',
+ vlan: {
+ label: 'VLAN Range(s)',
isEditable: true
},
- endVlan: {
+ /* endVlan: {
label: 'label.end.vlan',
isEditable: true
- },
- tags: { label: 'Tags', isEditable: true },
+ },*/
+
+ tags: { label: 'Tags', isEditable: true },
broadcastdomainrange: { label: 'label.broadcast.domain.range' }
},
{ //updateTrafficType API
@@ -1148,9 +1149,9 @@
success: function(json) {
selectedPhysicalNetworkObj = json.listphysicalnetworksresponse.physicalnetwork[0];
- var startVlan, endVlan;
+ // var startVlan, endVlan;
var vlan = selectedPhysicalNetworkObj.vlan;
- if(vlan != null && vlan.length > 0) {
+ /* if(vlan != null && vlan.length > 0) {
if(vlan.indexOf("-") != -1) {
var vlanArray = vlan.split("-");
startVlan = vlanArray[0];
@@ -1161,7 +1162,7 @@
}
selectedPhysicalNetworkObj["startVlan"] = startVlan;
selectedPhysicalNetworkObj["endVlan"] = endVlan;
- }
+ }*/
//traffic type
var xentrafficlabel, kvmtrafficlabel, vmwaretrafficlabel;