You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mi...@apache.org on 2012/09/18 05:15:47 UTC
[1/3] git commit: CLOUDSTACK-115 UI - Currently there is no way an
User can specify network domain suffix to an Isolated Guest Network on the
UI.
Updated Branches:
refs/heads/master 7fa4d4329 -> 955cbd97b
CLOUDSTACK-115 UI - Currently there is no way an User can specify network domain suffix to an Isolated Guest Network on the UI.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/cf5d7f87
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/cf5d7f87
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/cf5d7f87
Branch: refs/heads/master
Commit: cf5d7f879fca32d79fbbc58072d3a40b9620b1d1
Parents: 7fa4d43
Author: Mice Xia <mi...@tcloudcomputing.com>
Authored: Tue Sep 18 09:51:23 2012 +0800
Committer: Mice Xia <mi...@tcloudcomputing.com>
Committed: Tue Sep 18 11:18:44 2012 +0800
----------------------------------------------------------------------
ui/scripts/network.js | 51 ++++++++++++++++++++++++++-----------------
1 files changed, 31 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cf5d7f87/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 1a7769a..c6acc75 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -311,6 +311,7 @@
dependsOn: 'networkOfferingId',
select: function(args) {
var networkOfferingObj;
+ var $form = args.$select.closest('form');
$(networkOfferingObjs).each(function(key, value) {
if(value.id == args.networkOfferingId) {
networkOfferingObj = value;
@@ -338,40 +339,50 @@
args.response.success({ data: data });
}
});
+ $form.find('.form-item[rel=networkDomain]').hide();
}
else {
args.$select.closest('.form-item').hide();
+ $form.find('.form-item[rel=networkDomain]').show();
args.response.success({ data: null });
}
}
},
guestGateway: { label: 'label.guest.gateway' },
- guestNetmask: { label: 'label.guest.netmask' }
+ guestNetmask: { label: 'label.guest.netmask' },
+ networkDomain: { label: 'label.network.domain' }
}
},
action: function(args) {
- var dataObj = {
- zoneId: args.data.zoneId,
- name: args.data.name,
- displayText: args.data.displayText,
- networkOfferingId: args.data.networkOfferingId
- };
+ var dataObj = {
+ zoneId: args.data.zoneId,
+ name: args.data.name,
+ displayText: args.data.displayText,
+ networkOfferingId: args.data.networkOfferingId
+ };
+
if(args.data.guestGateway != null && args.data.guestGateway.length > 0) {
- $.extend(dataObj, {
- gateway: args.data.guestGateway
- });
- }
+ $.extend(dataObj, {
+ gateway: args.data.guestGateway
+ });
+ }
if(args.data.guestNetmask != null && args.data.guestNetmask.length > 0) {
- $.extend(dataObj, {
- netmask: args.data.guestNetmask
- });
- }
- if(args.$form.find('.form-item[rel=vpcid]').css("display") != "none") {
- $.extend(dataObj, {
- vpcid: args.data.vpcid
- });
- }
+ $.extend(dataObj, {
+ netmask: args.data.guestNetmask
+ });
+ }
+ if(args.$form.find('.form-item[rel=vpcid]').css("display") != "none") {
+ $.extend(dataObj, {
+ vpcid: args.data.vpcid
+ });
+ }
+ if(args.data.networkDomain != null && args.data.networkDomain.length > 0 && args.$form.find('.form-item[rel=vpcid]').css("display") == "none") {
+ $.extend(dataObj, {
+ networkDomain: args.data.networkDomain
+ });
+ }
+
$.ajax({
url: createURL('createNetwork'),
data: dataObj,