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 2012/07/10 23:58:52 UTC
[3/7] git commit: Add code to show/hide 'tiers' header fields
Add code to show/hide 'tiers' header fields
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/dd52157f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/dd52157f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/dd52157f
Branch: refs/heads/master
Commit: dd52157f0927da18b2eb4fba5173b79fd43f0da9
Parents: 5fa4f4c
Author: Brian Federle <br...@citrix.com>
Authored: Tue Jul 10 14:17:38 2012 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Jul 10 14:57:07 2012 -0700
----------------------------------------------------------------------
ui/scripts/network.js | 26 +++++++++++++++++++++++++-
ui/scripts/ui/widgets/multiEdit.js | 1 +
2 files changed, 26 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dd52157f/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 005d999..4e0be67 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -2194,7 +2194,9 @@
}
}
},
- dataProvider: function(args) {
+ dataProvider: function(args) {
+ var $multi = args.$multi;
+
$.ajax({
url: createURL('listLoadBalancerRules'),
data: {
@@ -2289,6 +2291,16 @@
});
}
});
+
+ // Check if tiers are present; hide/show header drop-down
+ var hasTiers = false;
+ var $headerFields = $multi.find('.header-fields');
+
+ if (hasTiers) {
+ $headerFields.hide();
+ } else {
+ $headerFields.show();
+ }
}
},
@@ -2444,6 +2456,8 @@
}
},
dataProvider: function(args) {
+ var $multi = args.$multi;
+
$.ajax({
url: createURL('listPortForwardingRules'),
data: {
@@ -2495,6 +2509,16 @@
}
});
});
+
+ // Check if tiers are present; hide/show header drop-down
+ var hasTiers = false;
+ var $headerFields = $multi.find('.header-fields');
+
+ if (hasTiers) {
+ $headerFields.hide();
+ } else {
+ $headerFields.show();
+ }
},
error: function(data) {
args.response.error(parseXMLHttpResponse(data));
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dd52157f/ui/scripts/ui/widgets/multiEdit.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/multiEdit.js b/ui/scripts/ui/widgets/multiEdit.js
index e77901e..cc793d3 100644
--- a/ui/scripts/ui/widgets/multiEdit.js
+++ b/ui/scripts/ui/widgets/multiEdit.js
@@ -896,6 +896,7 @@
var getData = function() {
dataProvider({
context: context,
+ $multi: $multi,
response: {
success: function(args) {
$multi.find('.data-item').remove();