You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pr...@apache.org on 2012/11/29 01:01:18 UTC
[25/50] [abbrv] git commit: CLOUDSTACK-542: cloudtack UI - create
network offering dialog - hide NetworkACL service field when Guest Type is
selected as Shared.
CLOUDSTACK-542: cloudtack UI - create network offering dialog - hide NetworkACL service field when Guest Type is selected as Shared.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c0d39ebb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c0d39ebb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c0d39ebb
Branch: refs/heads/api_refactoring
Commit: c0d39ebbfef079dcad7ed1c534a0de6d3c84f34d
Parents: 08bd175
Author: Jessica Wang <je...@citrix.com>
Authored: Mon Nov 26 15:26:15 2012 -0800
Committer: Jessica Wang <je...@citrix.com>
Committed: Mon Nov 26 15:26:15 2012 -0800
----------------------------------------------------------------------
ui/scripts/configuration.js | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c0d39ebb/ui/scripts/configuration.js
----------------------------------------------------------------------
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index d7af6d4..c82b85f 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -1211,7 +1211,7 @@
//CS-16612 show all services regardless of guestIpType(Shared/Isolated)
/*
- //hide/show service fields upon guestIpType(Shared/Isolated), having VpcVirtualRouter or not ***** (begin) *****
+ //hide/show service fields ***** (begin) *****
var serviceFieldsToHide = [];
if($guestTypeField.val() == 'Shared') { //Shared network offering
serviceFieldsToHide = [
@@ -1248,7 +1248,21 @@
serviceFieldsToHide = temp;
}
}
-
+ */
+
+
+ //CS-16687: NetworkACL should be removed when the guest_type is SHARED
+ //hide/show service fields ***** (begin) *****
+ var serviceFieldsToHide = [];
+ if($guestTypeField.val() == 'Shared') { //Shared network offering
+ serviceFieldsToHide = [
+ 'service.NetworkACL.isEnabled'
+ ];
+ }
+ else { //Isolated network offering
+ serviceFieldsToHide = [];
+ }
+
//hide service fields that are included in serviceFieldsToHide
var $serviceCheckboxesToHide = args.$form.find('.form-item').filter(function() {
if ($.inArray($(this).attr('rel'), serviceFieldsToHide) > -1) {
@@ -1276,9 +1290,8 @@
}
}
}
- //hide/show service fields upon guestIpType(Shared/Isolated), having VpcVirtualRouter or not ***** (end) *****
- */
-
+ //hide/show service fields ***** (end) *****
+
//show LB InlineMode dropdown only when (1)LB Service is checked (2)Service Provider is F5
if((args.$form.find('.form-item[rel=\"service.Lb.isEnabled\"]').find('input[type=checkbox]').is(':checked') == true)