Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EBD8218E0E for ; Fri, 7 Aug 2015 21:10:16 +0000 (UTC) Received: (qmail 36573 invoked by uid 500); 7 Aug 2015 21:10:16 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 36474 invoked by uid 500); 7 Aug 2015 21:10:16 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 35403 invoked by uid 99); 7 Aug 2015 21:10:15 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Aug 2015 21:10:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 99D35E682A; Fri, 7 Aug 2015 21:10:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dahn@apache.org To: commits@cloudstack.apache.org Date: Fri, 07 Aug 2015 21:10:21 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [07/16] git commit: updated refs/heads/master to b074fc7 Removed trailing whitespace from ui/scripts/*.js Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2bdbaf45 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2bdbaf45 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2bdbaf45 Branch: refs/heads/master Commit: 2bdbaf453e63db3b07fedd1ea869dfaad5b549b6 Parents: a5e563a Author: Kevin Dierkx Authored: Fri Aug 7 11:25:15 2015 +0200 Committer: Kevin Dierkx Committed: Fri Aug 7 11:25:15 2015 +0200 ---------------------------------------------------------------------- ui/scripts/accounts.js | 34 +- ui/scripts/accountsWizard.js | 8 +- ui/scripts/affinity.js | 10 +- ui/scripts/autoscaler.js | 2 +- ui/scripts/cloudStack.js | 28 +- ui/scripts/configuration.js | 46 +- ui/scripts/dashboard.js | 30 +- ui/scripts/domains.js | 14 +- ui/scripts/events.js | 24 +- ui/scripts/globalSettings.js | 44 +- ui/scripts/instanceWizard.js | 190 +-- ui/scripts/instances.js | 232 +-- ui/scripts/network.js | 440 ++--- ui/scripts/projects.js | 22 +- ui/scripts/regions.js | 16 +- ui/scripts/sharedFunctions.js | 62 +- ui/scripts/storage.js | 134 +- ui/scripts/system.js | 2050 ++++++++++++------------ ui/scripts/templates.js | 292 ++-- ui/scripts/ui-custom/accountsWizard.js | 8 +- ui/scripts/ui-custom/instanceWizard.js | 22 +- ui/scripts/ui-custom/physicalResources.js | 2 +- ui/scripts/ui-custom/pluginListing.js | 4 +- ui/scripts/ui-custom/zoneWizard.js | 34 +- ui/scripts/ui/core.js | 4 +- ui/scripts/ui/dialog.js | 12 +- ui/scripts/ui/utils.js | 2 +- ui/scripts/ui/widgets/detailView.js | 18 +- ui/scripts/ui/widgets/listView.js | 28 +- ui/scripts/ui/widgets/multiEdit.js | 16 +- ui/scripts/vpc.js | 98 +- ui/scripts/zoneWizard.js | 366 ++--- 32 files changed, 2146 insertions(+), 2146 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2bdbaf45/ui/scripts/accounts.js ---------------------------------------------------------------------- diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js index 6f55b3d..f6fcc27 100644 --- a/ui/scripts/accounts.js +++ b/ui/scripts/accounts.js @@ -17,7 +17,7 @@ (function(cloudStack) { var domainObjs; - + cloudStack.sections.accounts = { title: 'label.accounts', id: 'accounts', @@ -91,7 +91,7 @@ } }, - + addLdapAccount: { label: 'label.add.ldap.account', isHeader: true, @@ -123,7 +123,7 @@ ) } - } + } }, dataProvider: function(args) { @@ -422,11 +422,11 @@ data: data, async: true, success: function(json) { - var resourcecounts= json.updateresourcecountresponse.resourcecount; + var resourcecounts= json.updateresourcecountresponse.resourcecount; //pop up API response in a dialog box since only updateResourceCount API returns resourcecount (listResourceLimits API does NOT return resourcecount) var msg = ''; if (resourcecounts != null) { - for (var i = 0; i < resourcecounts.length; i++) { + for (var i = 0; i < resourcecounts.length; i++) { switch (resourcecounts[i].resourcetype) { case '0': msg += 'Instance'; //vmLimit @@ -443,8 +443,8 @@ case '4': msg += 'Template'; //templateLimit break; - case '5': - continue; //resourcetype 5 is not in use. so, skip to next item. + case '5': + continue; //resourcetype 5 is not in use. so, skip to next item. break; case '6': msg += 'Network'; //networkLimit @@ -463,18 +463,18 @@ break; case '11': msg += 'Secondary Storage'; //secondaryStorageLimit - break; + break; } - + msg += ' Count: ' + resourcecounts[i].resourcecount + '
'; } } - - + + cloudStack.dialog.notice({ message: msg - }); - + }); + args.response.success(); }, error: function(json) { @@ -653,12 +653,12 @@ } }, - + tabFilter: function(args) { var hiddenTabs = []; if(!isAdmin()) { hiddenTabs.push('settings'); - } + } return hiddenTabs; }, @@ -2011,13 +2011,13 @@ if (jsonObj.state == "disabled") allowedActions.push("enable"); allowedActions.push("remove"); - + allowedActions.push("changePassword"); allowedActions.push("generateKeys"); if (g_idpList) { allowedActions.push("configureSamlAuthorization"); } - } + } } return allowedActions; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2bdbaf45/ui/scripts/accountsWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/accountsWizard.js b/ui/scripts/accountsWizard.js index 03dc65c..2806bfb 100644 --- a/ui/scripts/accountsWizard.js +++ b/ui/scripts/accountsWizard.js @@ -78,9 +78,9 @@ validation: { required: true }, - select: function(args) { + select: function(args) { $.ajax({ - url: createURL("listDomains"), + url: createURL("listDomains"), success: function(json) { var items = []; domainObjs = json.listdomainsresponse.domain; @@ -227,7 +227,7 @@ } var accountType = args.data.accounttype; - if (accountType == "1") { //if "admin" is selected in account type dropdown + if (accountType == "1") { //if "admin" is selected in account type dropdown if (rootDomainId == undefined || args.data.domainid != rootDomainId ) { //but current login has no visibility to root domain object, or the selected domain is not root domain accountType = "2"; // change accountType from root-domain("1") to domain-admin("2") } @@ -313,6 +313,6 @@ } }); } - } + } }; }(cloudStack, jQuery)); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2bdbaf45/ui/scripts/affinity.js ---------------------------------------------------------------------- diff --git a/ui/scripts/affinity.js b/ui/scripts/affinity.js index 4f579e1..db8b79a 100644 --- a/ui/scripts/affinity.js +++ b/ui/scripts/affinity.js @@ -206,14 +206,14 @@ } } }; - + var affinitygroupActionfilter = cloudStack.actionFilter.affinitygroupActionfilter = function(args) { var jsonObj = args.context.item; - var allowedActions = []; + var allowedActions = []; if (jsonObj.type != 'ExplicitDedication' || isAdmin()) { - allowedActions.push("remove"); - } + allowedActions.push("remove"); + } return allowedActions; } - + })(cloudStack); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2bdbaf45/ui/scripts/autoscaler.js ---------------------------------------------------------------------- diff --git a/ui/scripts/autoscaler.js b/ui/scripts/autoscaler.js index c0c41ba..cf39d2c 100644 --- a/ui/scripts/autoscaler.js +++ b/ui/scripts/autoscaler.js @@ -1341,7 +1341,7 @@ array1.push("&interval=" + args.data.interval); array1.push("&scaleuppolicyids=" + args.scaleUpPolicyResponse.id); array1.push("&scaledownpolicyids=" + args.scaleDownPolicyResponse.id); - + $.ajax({ url: createURL('createAutoScaleVmGroup' + array1.join("")), dataType: 'json', http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2bdbaf45/ui/scripts/cloudStack.js ---------------------------------------------------------------------- diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js index 6d08735..146f8d1 100644 --- a/ui/scripts/cloudStack.js +++ b/ui/scripts/cloudStack.js @@ -136,15 +136,15 @@ dataType: "json", async: false, success: function(json) { - g_capabilities = json.listcapabilitiesresponse.capability; - g_supportELB = json.listcapabilitiesresponse.capability.supportELB.toString(); //convert boolean to string if it's boolean - g_kvmsnapshotenabled = json.listcapabilitiesresponse.capability.kvmsnapshotenabled; //boolean - g_regionsecondaryenabled = json.listcapabilitiesresponse.capability.regionsecondaryenabled; //boolean + g_capabilities = json.listcapabilitiesresponse.capability; + g_supportELB = json.listcapabilitiesresponse.capability.supportELB.toString(); //convert boolean to string if it's boolean + g_kvmsnapshotenabled = json.listcapabilitiesresponse.capability.kvmsnapshotenabled; //boolean + g_regionsecondaryenabled = json.listcapabilitiesresponse.capability.regionsecondaryenabled; //boolean if (json.listcapabilitiesresponse.capability.userpublictemplateenabled != null) { - g_userPublicTemplateEnabled = json.listcapabilitiesresponse.capability.userpublictemplateenabled.toString(); //convert boolean to string if it's boolean + g_userPublicTemplateEnabled = json.listcapabilitiesresponse.capability.userpublictemplateenabled.toString(); //convert boolean to string if it's boolean } g_userProjectsEnabled = json.listcapabilitiesresponse.capability.allowusercreateprojects; - + g_cloudstackversion = json.listcapabilitiesresponse.capability.cloudstackversion; @@ -251,7 +251,7 @@ }); $.cookie('role', g_role, { expires: 1 - }); + }); $.cookie('timezone', g_timezone, { expires: 1 }); @@ -268,14 +268,14 @@ async: false, success: function(json) { g_capabilities = json.listcapabilitiesresponse.capability; - g_supportELB = json.listcapabilitiesresponse.capability.supportELB.toString(); //convert boolean to string if it's boolean - g_kvmsnapshotenabled = json.listcapabilitiesresponse.capability.kvmsnapshotenabled; //boolean - g_regionsecondaryenabled = json.listcapabilitiesresponse.capability.regionsecondaryenabled; //boolean + g_supportELB = json.listcapabilitiesresponse.capability.supportELB.toString(); //convert boolean to string if it's boolean + g_kvmsnapshotenabled = json.listcapabilitiesresponse.capability.kvmsnapshotenabled; //boolean + g_regionsecondaryenabled = json.listcapabilitiesresponse.capability.regionsecondaryenabled; //boolean if (json.listcapabilitiesresponse.capability.userpublictemplateenabled != null) { - g_userPublicTemplateEnabled = json.listcapabilitiesresponse.capability.userpublictemplateenabled.toString(); //convert boolean to string if it's boolean + g_userPublicTemplateEnabled = json.listcapabilitiesresponse.capability.userpublictemplateenabled.toString(); //convert boolean to string if it's boolean } g_userProjectsEnabled = json.listcapabilitiesresponse.capability.allowusercreateprojects; - + g_cloudstackversion = json.listcapabilitiesresponse.capability.cloudstackversion; @@ -300,7 +300,7 @@ args.response.error(); } }); - + // Get project configuration // TEMPORARY -- replace w/ output of capability response, etc., once implemented window.g_projectsInviteRequired = false; @@ -462,6 +462,6 @@ cloudStack.uiCustom.login(loginArgs); - document.title = _l('label.app.name'); + document.title = _l('label.app.name'); }); })(cloudStack, jQuery); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2bdbaf45/ui/scripts/configuration.js ---------------------------------------------------------------------- diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js index 5cb6f8d..61f2d1f 100644 --- a/ui/scripts/configuration.js +++ b/ui/scripts/configuration.js @@ -137,7 +137,7 @@ } }, isCustomized: { - label: 'label.custom', + label: 'label.custom', isBoolean: true, isReverse: true, isChecked: false @@ -360,7 +360,7 @@ }, hostTags: { //Only one single host tag is supported at server-side. Multiple host tags are NOT supported at server-side. label: 'Host Tag', - docID: 'helpComputeOfferingHostTags' + docID: 'helpComputeOfferingHostTags' }, cpuCap: { label: 'label.CPU.cap', @@ -410,7 +410,7 @@ var $fields = $form.find('.field'); if ($(this).val() == "ImplicitDedicationPlanner") { $form.find('[rel=plannerMode]').css('display', 'block'); - } else { + } else { $form.find('[rel=plannerMode]').hide(); } }); @@ -596,9 +596,9 @@ provisioningType :args.data.provisioningType, customized: (args.data.isCustomized == "on") }; - + //custom fields (begin) - if (args.data.isCustomized != "on") { + if (args.data.isCustomized != "on") { $.extend(data, { cpuNumber: args.data.cpuNumber }); @@ -608,9 +608,9 @@ $.extend(data, { memory: args.data.memory }); - } + } //custom fields (end) - + if (args.data.deploymentPlanner != null && args.data.deploymentPlanner.length > 0) { $.extend(data, { deploymentplanner: args.data.deploymentPlanner @@ -872,7 +872,7 @@ converter: function(args) { if (args == undefined) return ''; - else + else return cloudStack.converters.convertBytes(args * 1024 * 1024); } }, @@ -936,10 +936,10 @@ }, deploymentplanner: { label: 'label.deployment.planner' - }, + }, plannerMode: { label: 'label.planner.mode' - }, + }, pciDevice: { label: 'label.gpu' }, @@ -972,13 +972,13 @@ async: true, success: function(json) { var item = json.listserviceofferingsresponse.serviceoffering[0]; - + if (item.deploymentplanner != null && item.serviceofferingdetails != null) { if (item.deploymentplanner == 'ImplicitDedicationPlanner' && item.serviceofferingdetails.ImplicitDedicationMode != null) { item.plannerMode = item.serviceofferingdetails.ImplicitDedicationMode; } } - + if (item.serviceofferingdetails != null) { item.pciDevice = item.serviceofferingdetails.pciDevice; item.vgpuType = item.serviceofferingdetails.vgpuType; @@ -1469,7 +1469,7 @@ converter: function(args) { if (args == undefined) return ''; - else + else return cloudStack.converters.convertBytes(args * 1024 * 1024); } }, @@ -1924,7 +1924,7 @@ customized: (args.data.isCustomized == "on") }; - if (args.data.isCustomized != "on") { + if (args.data.isCustomized != "on") { $.extend(data, { disksize: args.data.disksize }); @@ -2556,7 +2556,7 @@ args.$form.find('.form-item[rel=\"service.StaticNat.associatePublicIP\"]').hide(); args.$form.find('.form-item[rel=\"service.StaticNat.associatePublicIP\"]').find('input[type=checkbox]').attr('checked', false); } - + //StretchedL2Subnet checkbox should be displayed only when 'Connectivity' service is checked if (args.$form.find('.form-item[rel=\"service.Connectivity.isEnabled\"]').find('input[type=checkbox]').is(':checked')) { $supportsstrechedl2subnet.css('display', 'inline-block'); @@ -3045,8 +3045,8 @@ inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilitytype'] = 'lbSchemes'; inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilityvalue'] = 'internal'; serviceCapabilityIndex++; - } - } else if (value != '') { // normal data (serviceData.length ==1), e.g. "name", "displayText", "networkRate", "guestIpType", "lbType" (unwanted), "availability" (unwated when value is "Optional"), "egressdefaultpolicy", "state" (unwanted), "status" (unwanted), "allocationstate" (unwanted) + } + } else if (value != '') { // normal data (serviceData.length ==1), e.g. "name", "displayText", "networkRate", "guestIpType", "lbType" (unwanted), "availability" (unwated when value is "Optional"), "egressdefaultpolicy", "state" (unwanted), "status" (unwanted), "allocationstate" (unwanted) if (!(key == "lbType" || (key == "availability" && value == "Optional") || key == "state" || key == "status" || key == "allocationstate" || key == "useVpc" )) { inputData[key] = value; } @@ -3097,21 +3097,21 @@ if (inputData['guestIpType'] == "Shared") { //specifyVlan checkbox is disabled, so inputData won't include specifyVlan inputData['specifyVlan'] = true; //hardcode inputData['specifyVlan'] inputData['specifyIpRanges'] = true; - delete inputData.isPersistent; //if Persistent checkbox is unchecked, do not pass isPersistent parameter to API call since we need to keep API call's size as small as possible (p.s. isPersistent is defaulted as false at server-side) + delete inputData.isPersistent; //if Persistent checkbox is unchecked, do not pass isPersistent parameter to API call since we need to keep API call's size as small as possible (p.s. isPersistent is defaulted as false at server-side) } else if (inputData['guestIpType'] == "Isolated") { //specifyVlan checkbox is shown //inputData['specifyIpRanges'] = false; - delete inputData.specifyIpRanges; //if specifyIpRanges should be false, do not pass specifyIpRanges parameter to API call since we need to keep API call's size as small as possible (p.s. specifyIpRanges is defaulted as false at server-side) + delete inputData.specifyIpRanges; //if specifyIpRanges should be false, do not pass specifyIpRanges parameter to API call since we need to keep API call's size as small as possible (p.s. specifyIpRanges is defaulted as false at server-side) if (inputData['specifyVlan'] == 'on') { //specifyVlan checkbox is checked - inputData['specifyVlan'] = true; + inputData['specifyVlan'] = true; } else { //specifyVlan checkbox is unchecked - delete inputData.specifyVlan; //if specifyVlan checkbox is unchecked, do not pass specifyVlan parameter to API call since we need to keep API call's size as small as possible (p.s. specifyVlan is defaulted as false at server-side) + delete inputData.specifyVlan; //if specifyVlan checkbox is unchecked, do not pass specifyVlan parameter to API call since we need to keep API call's size as small as possible (p.s. specifyVlan is defaulted as false at server-side) } if (inputData['isPersistent'] == 'on') { //It is a persistent network inputData['isPersistent'] = true; } else { //Isolated Network with Non-persistent network - delete inputData.isPersistent; //if Persistent checkbox is unchecked, do not pass isPersistent parameter to API call since we need to keep API call's size as small as possible (p.s. isPersistent is defaulted as false at server-side) + delete inputData.isPersistent; //if Persistent checkbox is unchecked, do not pass isPersistent parameter to API call since we need to keep API call's size as small as possible (p.s. isPersistent is defaulted as false at server-side) } } @@ -4112,5 +4112,5 @@ return allowedActions; }; - + })(cloudStack, jQuery); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2bdbaf45/ui/scripts/dashboard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/dashboard.js b/ui/scripts/dashboard.js index dff6a91..50dfb22 100644 --- a/ui/scripts/dashboard.js +++ b/ui/scripts/dashboard.js @@ -28,7 +28,7 @@ user: { dataProvider: function(args) { var dataFns = { - instances: function(data) { + instances: function(data) { var totalInstanceCount = 0; $.ajax({ url: createURL("listVirtualMachines"), @@ -38,13 +38,13 @@ pageSize: 1 }, async: false, - success: function(json) { + success: function(json) { if (json.listvirtualmachinesresponse.count != undefined) { totalInstanceCount = json.listvirtualmachinesresponse.count; - } + } } }); - + var RunningInstanceCount = 0; $.ajax({ url: createURL("listVirtualMachines"), @@ -55,13 +55,13 @@ state: "Running" }, async: false, - success: function(json) { + success: function(json) { if (json.listvirtualmachinesresponse.count != undefined) { RunningInstanceCount = json.listvirtualmachinesresponse.count; - } + } } }); - + var stoppedInstanceCount = 0; $.ajax({ url: createURL("listVirtualMachines"), @@ -72,18 +72,18 @@ state: "Stopped" }, async: false, - success: function(json) { + success: function(json) { if (json.listvirtualmachinesresponse.count != undefined) { stoppedInstanceCount = json.listvirtualmachinesresponse.count; - } + } } }); - + dataFns.account($.extend(data, { runningInstances: RunningInstanceCount, stoppedInstances: stoppedInstanceCount, totalInstances: totalInstanceCount - })); + })); }, account: function(data) { @@ -103,7 +103,7 @@ data: { listAll: true, page: 1, - pageSize: (pageSize > 4? 4: pageSize) //if default.page.size > 4, show 4 items only (since space on dashboard is limited) + pageSize: (pageSize > 4? 4: pageSize) //if default.page.size > 4, show 4 items only (since space on dashboard is limited) //pageSize: 1 //for testing only }, success: function(json) { @@ -197,7 +197,7 @@ url: createURL('listAlerts'), data: { page: 1, - pageSize: (pageSize > 4? 4: pageSize) //if default.page.size > 4, show 4 items only (since space on dashboard is limited) + pageSize: (pageSize > 4? 4: pageSize) //if default.page.size > 4, show 4 items only (since space on dashboard is limited) }, success: function(json) { var alerts = json.listalertsresponse.alert ? @@ -222,7 +222,7 @@ data: { state: 'Alert', page: 1, - pageSize: (pageSize > 4? 4: pageSize) //if default.page.size > 4, show 4 items only (since space on dashboard is limited) + pageSize: (pageSize > 4? 4: pageSize) //if default.page.size > 4, show 4 items only (since space on dashboard is limited) }, success: function(json) { var hosts = json.listhostsresponse.host ? @@ -247,7 +247,7 @@ fetchLatest: data.fetchLatest, sortBy: 'usage', page: 0, - pageSize: (pageSize > 8? 8: pageSize) + pageSize: (pageSize > 8? 8: pageSize) }, success: function(json) { var capacities = json.listcapacityresponse.capacity ? http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2bdbaf45/ui/scripts/domains.js ---------------------------------------------------------------------- diff --git a/ui/scripts/domains.js b/ui/scripts/domains.js index e46f104..08a53cd 100644 --- a/ui/scripts/domains.js +++ b/ui/scripts/domains.js @@ -100,7 +100,7 @@ var domainObj; var data = { - id: args.context.domains[0].id + id: args.context.domains[0].id }; if (args.data.name != null) { //args.data.name == undefined means name field is not editable (when log in as normal user or domain admin) @@ -108,14 +108,14 @@ name: args.data.name }); } - + if (args.data.networkdomain != null) { //args.data.networkdomain == undefined means networkdomain field is not editable (when log in as normal user or domain admin) $.extend(data, { networkdomain: args.data.networkdomain }); } - - if('name' in data || 'networkdomain' in data) { + + if('name' in data || 'networkdomain' in data) { $.ajax({ url: createURL("updateDomain"), async: false, @@ -366,7 +366,7 @@ networkdomain: { label: 'label.network.domain', isEditable: function(args) { - if (isAdmin()) + if (isAdmin()) return true; else return false; @@ -652,8 +652,8 @@ if (jsonObj.level != 0) { //ROOT domain (whose level is 0) is not allowed to delete allowedActions.push("delete"); } - } else if (isDomainAdmin()) { - if (args.context.domains[0].id != g_domainid) { + } else if (isDomainAdmin()) { + if (args.context.domains[0].id != g_domainid) { allowedActions.push("edit"); //merge updateResourceLimit into edit } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2bdbaf45/ui/scripts/events.js ---------------------------------------------------------------------- diff --git a/ui/scripts/events.js b/ui/scripts/events.js index 9280429..2fd70dd 100644 --- a/ui/scripts/events.js +++ b/ui/scripts/events.js @@ -75,7 +75,7 @@ }, action: function(args) { var events = args.context.events; - + $.ajax({ url: createURL("deleteEvents"), data: { @@ -90,7 +90,7 @@ error:function(data) { args.response.error(parseXMLHttpResponse(data)); } - }); + }); } }, @@ -154,7 +154,7 @@ }); } }, - + archive: { label: 'label.archive.events', isHeader: true, @@ -215,7 +215,7 @@ } }, - + // Archive multiple events archiveMulti: { label: 'label.archive.events', @@ -232,7 +232,7 @@ }, action: function(args) { var events = args.context.events; - + $.ajax({ url: createURL("archiveEvents"), data: { @@ -247,7 +247,7 @@ error:function(data) { args.response.error(parseXMLHttpResponse(data)); } - }); + }); } } @@ -494,7 +494,7 @@ }, action: function(args) { var events = args.context.alerts; - + $.ajax({ url: createURL("deleteAlerts"), data: { @@ -509,10 +509,10 @@ error:function(data) { args.response.error(parseXMLHttpResponse(data)); } - }); + }); } }, - + remove: { label: 'label.delete.alerts', isHeader: true, @@ -593,7 +593,7 @@ }, action: function(args) { var events = args.context.alerts; - + $.ajax({ url: createURL("archiveAlerts"), data: { @@ -608,10 +608,10 @@ error:function(data) { args.response.error(parseXMLHttpResponse(data)); } - }); + }); } }, - + archive: { label: 'label.archive.alerts', isHeader: true, http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2bdbaf45/ui/scripts/globalSettings.js ---------------------------------------------------------------------- diff --git a/ui/scripts/globalSettings.js b/ui/scripts/globalSettings.js index 2b1fe5c..680b0fa 100644 --- a/ui/scripts/globalSettings.js +++ b/ui/scripts/globalSettings.js @@ -234,14 +234,14 @@ } } } - }, + }, baremetalRct: { type: 'select', title: 'label.baremetal.rack.configuration', listView: { id: 'baremetalRct', label: 'label.baremetal.rack.configuration', - fields: { + fields: { id: { label: 'label.id' }, @@ -252,19 +252,19 @@ dataProvider: function(args) { var data = {}; listViewDataProvider(args, data); - + $.ajax({ url: createURL("listBaremetalRct"), data: data, - success: function(json) { + success: function(json) { args.response.success({ data: json.listbaremetalrctresponse.baremetalrct }); } - }); + }); }, actions: { add: { label: 'label.add.baremetal.rack.configuration', - messages: { + messages: { notification: function(args) { return 'label.add.baremetal.rack.configuration'; } @@ -280,18 +280,18 @@ } } }, - action: function(args) { + action: function(args) { $.ajax({ url: createURL("addBaremetalRct"), data: { baremetalrcturl: args.data.url }, - success: function(json) { + success: function(json) { var jid = json.addbaremetalrctresponse.jobid args.response.success({ _custom: { jobId: jid, - getUpdatedItem: function(json) { + getUpdatedItem: function(json) { return json.queryasyncjobresultresponse.jobresult.baremetalrct; } } @@ -303,8 +303,8 @@ poll: pollAsyncJobResult } } - }, - + }, + detailView: { name: "details", actions: { @@ -318,7 +318,7 @@ return 'label.delete.baremetal.rack.configuration'; } }, - action: function(args) { + action: function(args) { var data = { id: args.context.baremetalRct[0].id }; @@ -326,12 +326,12 @@ url: createURL('deleteBaremetalRct'), data: data, success: function(json) { - var jid = json.deletebaremetalrctresponse.jobid; + var jid = json.deletebaremetalrctresponse.jobid; args.response.success({ _custom: { jobId: jid } - }); + }); } }); }, @@ -339,7 +339,7 @@ poll: pollAsyncJobResult } } - }, + }, tabs: { details: { title: 'label.details', @@ -351,23 +351,23 @@ label: 'label.url' } }], - dataProvider: function(args) { + dataProvider: function(args) { var data = { id: args.context.baremetalRct[0].id - }; + }; $.ajax({ url: createURL("listBaremetalRct"), data: data, - success: function(json) { + success: function(json) { args.response.success({ data: json.listbaremetalrctresponse.baremetalrct[0] }); } - }); + }); } } - } - } + } + } } - }, + }, hypervisorCapabilities: { type: 'select', title: 'label.hypervisor.capabilities', http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2bdbaf45/ui/scripts/instanceWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js index 3d3f74e..877658a 100644 --- a/ui/scripts/instanceWizard.js +++ b/ui/scripts/instanceWizard.js @@ -184,7 +184,7 @@ }); } } - }); + }); $.ajax({ url: createURL("listTemplates&templatefilter=sharedexecutable&zoneid=" + args.currentData.zoneid), dataType: "json", @@ -199,7 +199,7 @@ }); } } - }); + }); } else if (selectedTemplateOrIso == 'select-iso') { $.ajax({ url: createURL("listIsos&isofilter=featured&zoneid=" + args.currentData.zoneid + "&bootable=true"), @@ -248,7 +248,7 @@ sharedIsoObjs = json.listisosresponse.iso; } } - }); + }); } //***** get templates/ISOs (end) ***** @@ -282,19 +282,19 @@ //// return true; // Disabled -- not supported in backend right now //// - + if (selectedTemplateOrIso == 'select-template') { return false; //show Root Disk Size field } else { //selectedTemplateOrIso == 'select-iso' return true; //hide Root Disk Size field - } + } } }); }, // Step 3: Service offering function(args) { - selectedTemplateObj = null; //reset + selectedTemplateObj = null; //reset if (args.currentData["select-template"] == "select-template") { if (featuredTemplateObjs != null && featuredTemplateObjs.length > 0) { for (var i = 0; i < featuredTemplateObjs.length; i++) { @@ -323,7 +323,7 @@ } } } - } + } if (selectedTemplateObj == null) { if (sharedTemplateObjs != null && sharedTemplateObjs.length > 0) { for (var i = 0; i < sharedTemplateObjs.length; i++) { @@ -333,7 +333,7 @@ } } } - } + } if (selectedTemplateObj == null) { alert("unable to find matched template object"); } else { @@ -346,27 +346,27 @@ // if the user is leveraging a template, then we can show custom IOPS, if applicable var canShowCustomIopsForServiceOffering = (args.currentData["select-template"] != "select-iso" ? true : false); - + // get serviceOfferingObjs - $(window).removeData("cloudStack.module.instanceWizard.serviceOfferingObjs"); + $(window).removeData("cloudStack.module.instanceWizard.serviceOfferingObjs"); $(window).trigger("cloudStack.module.instanceWizard.serviceOffering.dataProvider", { context: args.context, currentData: args.currentData - }); - if ($(window).data("cloudStack.module.instanceWizard.serviceOfferingObjs") == undefined) { + }); + if ($(window).data("cloudStack.module.instanceWizard.serviceOfferingObjs") == undefined) { $.ajax({ url: createURL("listServiceOfferings&issystem=false"), dataType: "json", async: false, - success: function(json) { + success: function(json) { serviceOfferingObjs = json.listserviceofferingsresponse.serviceoffering; } - }); - } else { - serviceOfferingObjs = $(window).data("cloudStack.module.instanceWizard.serviceOfferingObjs"); + }); + } else { + serviceOfferingObjs = $(window).data("cloudStack.module.instanceWizard.serviceOfferingObjs"); } - - + + args.response.success({ canShowCustomIops: canShowCustomIopsForServiceOffering, customFlag: 'iscustomized', @@ -375,7 +375,7 @@ data: { serviceOfferings: serviceOfferingObjs } - }); + }); }, // Step 4: Data disk offering @@ -409,9 +409,9 @@ var data = { affinityGroups: affinitygroups }; - + if(selectedZoneObj.domainid != null && selectedZoneObj.affinitygroupid != null) { - var defaultAffinityGroup; + var defaultAffinityGroup; if(affinitygroups != null) { for(var i = 0; i < affinitygroups.length; i++) { if(affinitygroups[i].id == selectedZoneObj.affinitygroupid) { @@ -419,13 +419,13 @@ break; } } - } + } $.extend(data, { selectedObj: defaultAffinityGroup, selectedObjNonEditable: true }); - } - + } + args.response.success({ data: data }); @@ -608,21 +608,21 @@ } } - + // get networkObjsToPopulate - $(window).removeData("cloudStack.module.instanceWizard.networkObjs"); + $(window).removeData("cloudStack.module.instanceWizard.networkObjs"); $(window).trigger("cloudStack.module.instanceWizard.network.dataProvider", { context: args.context, currentData: args.currentData, networkObjsToPopulate: networkObjsToPopulate - }); - if ($(window).data("cloudStack.module.instanceWizard.networkObjs") == undefined) { - //do nothing - } else { - networkObjsToPopulate = $(window).data("cloudStack.module.instanceWizard.networkObjs"); //override networkObjsToPopulate - } - - + }); + if ($(window).data("cloudStack.module.instanceWizard.networkObjs") == undefined) { + //do nothing + } else { + networkObjsToPopulate = $(window).data("cloudStack.module.instanceWizard.networkObjs"); //override networkObjsToPopulate + } + + $.ajax({ url: createURL("listNetworkOfferings"), dataType: "json", @@ -729,49 +729,49 @@ // Create a new VM!!!! var deployVmData = {}; - //step 1 : select zone + //step 1 : select zone $.extend(deployVmData, { zoneid : args.data.zoneid }); - //step 2: select template + //step 2: select template $.extend(deployVmData, { templateid : args.data.templateid }); - + $.extend(deployVmData, { hypervisor : selectedHypervisor }); - + if (args.$wizard.find('input[name=rootDiskSize]').parent().css('display') != 'none') { - if (args.$wizard.find('input[name=rootDiskSize]').val().length > 0) { + if (args.$wizard.find('input[name=rootDiskSize]').val().length > 0) { $.extend(deployVmData, { rootdisksize : args.$wizard.find('input[name=rootDiskSize]').val() }); } } - - //step 3: select service offering + + //step 3: select service offering $.extend(deployVmData, { serviceofferingid : args.data.serviceofferingid }); - + if (args.$wizard.find('input[name=compute-cpu-cores]').parent().parent().css('display') != 'none') { - if (args.$wizard.find('input[name=compute-cpu-cores]').val().length > 0) { + if (args.$wizard.find('input[name=compute-cpu-cores]').val().length > 0) { $.extend(deployVmData, { 'details[0].cpuNumber' : args.$wizard.find('input[name=compute-cpu-cores]').val() }); - } - if (args.$wizard.find('input[name=compute-cpu]').val().length > 0) { + } + if (args.$wizard.find('input[name=compute-cpu]').val().length > 0) { $.extend(deployVmData, { 'details[0].cpuSpeed' : args.$wizard.find('input[name=compute-cpu]').val() }); - } - if (args.$wizard.find('input[name=compute-memory]').val().length > 0) { + } + if (args.$wizard.find('input[name=compute-memory]').val().length > 0) { $.extend(deployVmData, { 'details[0].memory' : args.$wizard.find('input[name=compute-memory]').val() }); - } + } } if (args.$wizard.find('input[name=disk-min-iops]').parent().parent().css('display') != 'none') { @@ -788,12 +788,12 @@ } //step 4: select disk offering - if (args.data.diskofferingid != null && args.data.diskofferingid != "0") { + if (args.data.diskofferingid != null && args.data.diskofferingid != "0") { $.extend(deployVmData, { diskofferingid : args.data.diskofferingid }); - - if (selectedDiskOfferingObj.iscustomized == true) { + + if (selectedDiskOfferingObj.iscustomized == true) { $.extend(deployVmData, { size : args.data.size }); @@ -825,7 +825,7 @@ checkedAffinityGroupIdArray = []; } - if (checkedAffinityGroupIdArray.length > 0) { + if (checkedAffinityGroupIdArray.length > 0) { $.extend(deployVmData, { affinitygroupids : checkedAffinityGroupIdArray.join(",") }); @@ -834,7 +834,7 @@ //step 6: select network if (step6ContainerType == 'select-network' || step6ContainerType == 'select-advanced-sg') { var array2 = []; - var array3 = []; + var array3 = []; var defaultNetworkId = args.data.defaultNetwork; //args.data.defaultNetwork might be equal to string "new-network" or a network ID var checkedNetworkIdArray; @@ -884,58 +884,58 @@ if (defaultNetworkId == null) { cloudStack.dialog.notice({ message: "Please select a default network in Network step." - }); + }); return; - } - + } + if (checkedNetworkIdArray.length > 0) { for (var i = 0; i < checkedNetworkIdArray.length; i++) { - if (checkedNetworkIdArray[i] == defaultNetworkId) { - array2.unshift(defaultNetworkId); - + if (checkedNetworkIdArray[i] == defaultNetworkId) { + array2.unshift(defaultNetworkId); + var ipToNetwork = { networkid: defaultNetworkId - }; + }; if (args.data["new-network"] == "create-new-network") { if (args.data['new-network-ip'] != null && args.data['new-network-ip'].length > 0) { $.extend(ipToNetwork, { ip: args.data['new-network-ip'] - }); + }); } } else { if (args.data["my-network-ips"][i] != null && args.data["my-network-ips"][i].length > 0) { $.extend(ipToNetwork, { ip: args.data["my-network-ips"][i] - }); + }); } } - array3.unshift(ipToNetwork); - - } else { + array3.unshift(ipToNetwork); + + } else { array2.push(checkedNetworkIdArray[i]); - + var ipToNetwork = { networkid: checkedNetworkIdArray[i] - }; + }; if (args.data["my-network-ips"][i] != null && args.data["my-network-ips"][i].length > 0) { $.extend(ipToNetwork, { ip: args.data["my-network-ips"][i] - }); + }); } - array3.push(ipToNetwork); - } + array3.push(ipToNetwork); + } } } - + //deployVmData.push("&networkIds=" + array2.join(",")); //ipToNetworkMap can't be specified along with networkIds or ipAddress - - for (var k = 0; k < array3.length; k++) { - deployVmData["iptonetworklist[" + k + "].networkid"] = array3[k].networkid; - if (array3[k].ip != undefined && array3[k].ip.length > 0) { - deployVmData["iptonetworklist[" + k + "].ip"] = array3[k].ip; + + for (var k = 0; k < array3.length; k++) { + deployVmData["iptonetworklist[" + k + "].networkid"] = array3[k].networkid; + if (array3[k].ip != undefined && array3[k].ip.length > 0) { + deployVmData["iptonetworklist[" + k + "].ip"] = array3[k].ip; } - } - + } + } else if (step6ContainerType == 'select-security-group') { var checkedSecurityGroupIdArray; if (typeof(args.data["security-groups"]) == "object" && args.data["security-groups"].length != null) { //args.data["security-groups"] is an array of string, e.g. ["2375f8cc-8a73-4b8d-9b26-50885a25ffe0", "27c60d2a-de7f-4bb7-96e5-a602cec681df","c6301d77-99b5-4e8a-85e2-3ea2ab31c342"], @@ -947,7 +947,7 @@ checkedSecurityGroupIdArray = []; } - if (checkedSecurityGroupIdArray.length > 0) { + if (checkedSecurityGroupIdArray.length > 0) { $.extend(deployVmData, { securitygroupids : checkedSecurityGroupIdArray.join(",") }); @@ -980,26 +980,26 @@ array2.push(checkedNetworkIdArray[i]); } } - + $.extend(deployVmData, { networkids : array2.join(",") }); } } else if (step6ContainerType == 'nothing-to-select') { - if ("vpc" in args.context) { //from VPC tier - deployVmData["iptonetworklist[0].networkid"] = args.context.networks[0].id; - if (args.data["vpc-specify-ip"] != undefined && args.data["vpc-specify-ip"].length > 0) { - deployVmData["iptonetworklist[0].ip"] = args.data["vpc-specify-ip"]; + if ("vpc" in args.context) { //from VPC tier + deployVmData["iptonetworklist[0].networkid"] = args.context.networks[0].id; + if (args.data["vpc-specify-ip"] != undefined && args.data["vpc-specify-ip"].length > 0) { + deployVmData["iptonetworklist[0].ip"] = args.data["vpc-specify-ip"]; } - + $.extend(deployVmData, { domainid : args.context.vpc[0].domainid }); - if (args.context.vpc[0].account != null) { + if (args.context.vpc[0].account != null) { $.extend(deployVmData, { account : args.context.vpc[0].account - }); - } else if (args.context.vpc[0].projectid != null) { + }); + } else if (args.context.vpc[0].projectid != null) { $.extend(deployVmData, { projectid : args.context.vpc[0].projectid }); @@ -1015,28 +1015,28 @@ } var displayname = args.data.displayname; - if (displayname != null && displayname.length > 0) { + if (displayname != null && displayname.length > 0) { $.extend(deployVmData, { displayname : displayname - }); + }); $.extend(deployVmData, { name : displayname }); } var group = args.data.groupname; - if (group != null && group.length > 0) { + if (group != null && group.length > 0) { $.extend(deployVmData, { group : group }); } - + var keyboard = args.data.keyboardLanguage; - if (keyboard != null && keyboard.length > 0) { //when blank option (default option) is selected => args.data.keyboardLanguage == "" + if (keyboard != null && keyboard.length > 0) { //when blank option (default option) is selected => args.data.keyboardLanguage == "" $.extend(deployVmData, { keyboard : keyboard }); - } + } if (g_hostid != null) { $.extend(deployVmData, { @@ -1050,7 +1050,7 @@ userdata : todb(btoa(userdata)) }); } - + $(window).trigger('cloudStack.deployVirtualMachine', { deployVmData: deployVmData, formData: args.data