Updated Branches: refs/heads/4.2 c5f1aea39 -> e50eb3def
CLOUDSTACK-4142: UI > remove fieldPreFilter() that is not in use any more. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e50eb3de Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e50eb3de Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e50eb3de Branch: refs/heads/4.2 Commit: e50eb3deff107983b93ff7955e5328ef82dc3232 Parents: c5f1aea Author: Jessica Wang <[email protected]> Authored: Wed Aug 14 10:37:09 2013 -0700 Committer: Jessica Wang <[email protected]> Committed: Wed Aug 14 10:38:49 2013 -0700 ---------------------------------------------------------------------- ui/scripts/network.js | 37 ------------------------------------- ui/scripts/vpc.js | 15 +-------------- 2 files changed, 1 insertion(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e50eb3de/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index ef891aa..a03dc13 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -3237,43 +3237,6 @@ } }, multipleAdd: true, - - /* - fieldPreFilter: function(args) { - var hiddenFields = []; - if ('vpc' in args.context) { //from VPC section - hiddenFields.push('autoScale'); //autoScale is not supported in VPC - } else { //from Guest Network section - $.ajax({ - url: createURL('listNetworkOfferings'), - data: { - id: args.context.networks[0].networkofferingid - }, - async: false, - success: function(json) { - var serviceArray = json.listnetworkofferingsresponse.networkoffering[0].service; - var lbProviderArrayIncludesNetscaler = false; - for (var i = 0; i < serviceArray.length; i++) { - if (serviceArray[i].name == "Lb") { - var providerArray = serviceArray[i].provider; - for (var k = 0; k < providerArray.length; k++) { - if (providerArray[k].name == "Netscaler") { - lbProviderArrayIncludesNetscaler = true; - break; - } - } - break; - } - } - if (lbProviderArrayIncludesNetscaler == false) { - hiddenFields.push('autoScale'); //autoScale is not supported in a network that is not using Netscaler provider for LB service (CS-16459) - } - } - }); - } - return hiddenFields; // Returns fields to be hidden - }, - */ fields: { 'name': { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e50eb3de/ui/scripts/vpc.js ---------------------------------------------------------------------- diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js index bf854d2..af37873 100644 --- a/ui/scripts/vpc.js +++ b/ui/scripts/vpc.js @@ -17,20 +17,7 @@ (function($, cloudStack) { var aclMultiEdit = { noSelect: true, - - /* - fieldPreFilter: function(args) { - var context = args.context; - var hiddenFields = []; - - if (context.networks) { // from tier detail view - hiddenFields.push('networkid'); - } - - return hiddenFields; // Returns fields to be hidden - }, - */ - + reorder: { moveDrag: { action: function(args) {
