change list-data variable name to listData
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/daf30f43 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/daf30f43 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/daf30f43 Branch: refs/heads/stratos-4.1.x Commit: daf30f435857067bdf7931f1d1cdaaff873137de Parents: e4284e2 Author: Thanuja <[email protected]> Authored: Thu Oct 8 22:19:40 2015 +0530 Committer: Akila Perera <[email protected]> Committed: Sat Oct 10 00:51:09 2015 +0530 ---------------------------------------------------------------------- .../console/applications_form.jag | 10 ++-- .../console/configure_form.jag | 50 ++++++++++---------- .../theme0/renderers/applications_form.js | 4 +- .../themes/theme0/renderers/configure_form.js | 2 +- .../themes/theme0/renderers/users_form.js | 2 +- .../console/users_form.jag | 20 ++++---- 6 files changed, 44 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/daf30f43/components/org.apache.stratos.manager.console/console/applications_form.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/applications_form.jag b/components/org.apache.stratos.manager.console/console/applications_form.jag index a9f8021..a68f8fd 100644 --- a/components/org.apache.stratos.manager.console/console/applications_form.jag +++ b/components/org.apache.stratos.manager.console/console/applications_form.jag @@ -24,7 +24,7 @@ include('/controllers/menu/menu_generator.jag'); var log = new Log("apachestratos.applications_form"), error = [], - list_data, + listData, caramel = require('caramel'), context = caramel.configs().context, menuJson = require('/controllers/menu/menu.json'), @@ -102,9 +102,9 @@ switch (formtype) { case "applications": formTitle = "Application", buttonText = "Application"; - list_data = util.RESTCalls.getApplications(); - if (list_data.status == 'error') { - list_data = null; + listData = util.RESTCalls.getApplications(); + if (listData.status == 'error') { + listData = null; } break; @@ -140,7 +140,7 @@ var caramelData = { //formDataRaw: JSON.stringify(partition_data.partition[0]), formDataEdit: JSON.stringify(formDataEdit), formData: JSON.stringify(formData), - list_data: list_data, + listData: listData, error: error, dasStatsPublisherEnabled: dasStatsPublisherEnabled, meteringDashboardUrl: meteringDashboardUrl http://git-wip-us.apache.org/repos/asf/stratos/blob/daf30f43/components/org.apache.stratos.manager.console/console/configure_form.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/configure_form.jag b/components/org.apache.stratos.manager.console/console/configure_form.jag index 18b0e48..3fea275 100644 --- a/components/org.apache.stratos.manager.console/console/configure_form.jag +++ b/components/org.apache.stratos.manager.console/console/configure_form.jag @@ -24,7 +24,7 @@ include('/controllers/menu/menu_generator.jag'); var log = new Log("apachestratos.configure_form"), error = [], - list_data, + listData, caramel = require('caramel'), context = caramel.configs().context, menuJson = require('/controllers/menu/menu.json'), @@ -97,63 +97,63 @@ if(isEdit == false && elements.action != 'new') { case "network-partitions": formTitle = "Network Partition", buttonText = "Network Partition"; - list_data = util.RESTCalls.getPartitions(); - if (list_data.status == 'error') { - list_data = null; + listData = util.RESTCalls.getPartitions(); + if (listData.status == 'error') { + listData = null; } break; case "autoscaling-policies": formTitle = "Auto-scaling Policie", buttonText = "Auto-scaling Policy"; - list_data = util.RESTCalls.getPolicyAutoScales(); - if(list_data.status == 'error'){ - list_data = null; + listData = util.RESTCalls.getPolicyAutoScales(); + if(listData.status == 'error'){ + listData = null; } break; case "deployment-policies": formTitle = "Deployment Policie", buttonText = "Deployment Policy"; - list_data = util.RESTCalls.getPolicyDeployments(); - if (list_data.status == 'error') { - list_data = null; + listData = util.RESTCalls.getPolicyDeployments(); + if (listData.status == 'error') { + listData = null; } break; case "cartridges": formTitle = "Cartridge", buttonText = "Cartridge"; - list_data = util.RESTCalls.getCartridges(); - if (list_data.status == 'error') { - list_data = null; + listData = util.RESTCalls.getCartridges(); + if (listData.status == 'error') { + listData = null; } break; case "cartridge-groups": formTitle = "Cartridge Group", buttonText = "Cartridge Group"; - list_data = util.RESTCalls.getGroups(); - if (list_data.status == 'error') { - list_data = null; + listData = util.RESTCalls.getGroups(); + if (listData.status == 'error') { + listData = null; } break; case "kubernetes-clusters": formTitle = "Kubernetes Cluster", buttonText = "Kubernetes Cluster"; - list_data = util.RESTCalls.getKubernetesClusters(); - if (list_data.status == 'error') { - list_data = null; //TODO endpoint doesn't return correct info + listData = util.RESTCalls.getKubernetesClusters(); + if (listData.status == 'error') { + listData = null; //TODO endpoint doesn't return correct info } break; case "application-policies": formTitle = "Application Policie", buttonText = "Application Policy"; - list_data = util.RESTCalls.getApplicationPolicies(); - if (list_data.status == 'error') { - list_data = null; + listData = util.RESTCalls.getApplicationPolicies(); + if (listData.status == 'error') { + listData = null; } break; @@ -163,8 +163,8 @@ if(isEdit == false && elements.action != 'new') { } //check user has permission to access endpoints - if (list_data != null && list_data.hasOwnProperty('Error')) { - error.push(list_data.Error); + if (listData != null && listData.hasOwnProperty('Error')) { + error.push(listData.Error); } } @@ -257,7 +257,7 @@ var caramelData = { formData: JSON.stringify(formData), formtype:elements.formtype, buttonText: buttonText, - list_data: list_data, + listData: listData, error: error } http://git-wip-us.apache.org/repos/asf/stratos/blob/daf30f43/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/applications_form.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/applications_form.js b/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/applications_form.js index b87f893..e4ee172 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/applications_form.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/applications_form.js @@ -141,7 +141,7 @@ var render = function (theme, data, meta, require) { dasStatsPublisherEnabled: data.dasStatsPublisherEnabled, meteringDashboardUrl: data.meteringDashboardUrl, content_body: { - sections: data.list_data + sections: data.listData } } } @@ -396,7 +396,7 @@ var render = function (theme, data, meta, require) { isEdit: data.isEdit, formTitle: data.formTitle, content_body: { - sections: data.list_data + sections: data.listData } } } http://git-wip-us.apache.org/repos/asf/stratos/blob/daf30f43/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/configure_form.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/configure_form.js b/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/configure_form.js index a61121d..b85e59b 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/configure_form.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/configure_form.js @@ -150,7 +150,7 @@ var render = function (theme, data, meta, require) { isUpdate: data.isUpdate, formDataUpdate: data.formDataUpdate, formDataEdit: data.formDataEdit, - content_body: {sections: data.list_data + content_body: {sections: data.listData } } } http://git-wip-us.apache.org/repos/asf/stratos/blob/daf30f43/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/users_form.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/users_form.js b/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/users_form.js index 434facd..5adf9da 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/users_form.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/users_form.js @@ -75,7 +75,7 @@ var render = function (theme, data, meta, require) { formtype:data.formtype, isForm: data.isForm, content_body: {sections: - data.list_data + data.listData } } } http://git-wip-us.apache.org/repos/asf/stratos/blob/daf30f43/components/org.apache.stratos.manager.console/console/users_form.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/users_form.jag b/components/org.apache.stratos.manager.console/console/users_form.jag index e9c8b6d..9ca4632 100644 --- a/components/org.apache.stratos.manager.console/console/users_form.jag +++ b/components/org.apache.stratos.manager.console/console/users_form.jag @@ -32,7 +32,7 @@ var caramel = require('caramel'), context = caramel.configs().context, menuJson = require('/controllers/menu/menu.json'), userPermissions = session.get('PERMISSIONS'), - list_data, + listData, isForm = false; if (!elements) { @@ -57,22 +57,22 @@ var leftMenu = menuGenerator(context, menuJson.menu, userPermissions); if (elements.formtype == 'users') { formTitle = 'User'; - list_data = util.RESTCalls.getUserList(); - if (list_data.status == 'error') { - list_data = null; + listData = util.RESTCalls.getUserList(); + if (listData.status == 'error') { + listData = null; } } else if (elements.formtype == 'tenants') { formTitle = 'Tenant' - list_data = util.RESTCalls.getTenants(); - if (list_data.status == 'error') { - list_data = null; + listData = util.RESTCalls.getTenants(); + if (listData.status == 'error') { + listData = null; } } //check user has permission to access endpoints -if (list_data != null && list_data.hasOwnProperty('Error')) { - error.push(list_data.Error); +if (listData != null && listData.hasOwnProperty('Error')) { + error.push(listData.Error); } caramel.render({ @@ -83,7 +83,7 @@ caramel.render({ formDataRaw: JSON.stringify(formDataRaw), formData: JSON.stringify(formData), formtype:elements.formtype, - list_data: list_data, + listData: listData, left_menu: leftMenu, error: error });
