Updated Branches: refs/heads/master 2e8d7b7f0 -> 53561c362
fixing wizard issue and chaning info to debug logs Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/53561c36 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/53561c36 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/53561c36 Branch: refs/heads/master Commit: 53561c3629b84bd4782731d1b8769e9bf26ac058 Parents: 2e8d7b7 Author: rekathiru <[email protected]> Authored: Fri Feb 14 17:25:13 2014 +0530 Committer: rekathiru <[email protected]> Committed: Fri Feb 14 17:25:13 2014 +0530 ---------------------------------------------------------------------- .../console/controllers/wizardSubmit.jag | 19 ++++++++++++++++--- .../theme1/renderers/configure_stratos_wizard.js | 4 +++- .../console/util/utility.jag | 8 +++----- 3 files changed, 22 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/53561c36/components/org.apache.stratos.manager.console/console/controllers/wizardSubmit.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/wizardSubmit.jag b/components/org.apache.stratos.manager.console/console/controllers/wizardSubmit.jag index 19cb214..978466f 100755 --- a/components/org.apache.stratos.manager.console/console/controllers/wizardSubmit.jag +++ b/components/org.apache.stratos.manager.console/console/controllers/wizardSubmit.jag @@ -10,21 +10,33 @@ if(parseInt(thisStep) == 1 && policy != "" ){ utils.consoleAppUtil.deployPartitionDefinition(policy); + session.put("deploy_artifacts", "Partition Deployment"); + } if(parseInt(thisStep) == 2 && policy != "" ){ utils.consoleAppUtil.deployAutoscalePolicyDefinition(policy); + session.put("deploy_artifacts", "Autoscale Policy Deployment"); + } if(parseInt(thisStep) == 3 && policy != "" ){ var foo = utils.consoleAppUtil.deployDeploymentPolicyDefinition(policy); + session.put("deploy_artifacts", "Deployment Policy Deployment"); + } if(parseInt(thisStep) == 4 && policy != "" ){ utils.consoleAppUtil.deployLbDefinition(policy); + session.put("deploy_artifacts", "Lb Deployment"); + } if(parseInt(thisStep) == 5 && policy != "" ){ utils.consoleAppUtil.deployCartridgeDefinition(policy); + session.put("deploy_artifacts", "Cartridge Deployment"); + } if(parseInt(thisStep) == 6 && policy != "" ){ utils.consoleAppUtil.deployServiceDefinition(policy); + session.put("deploy_artifacts", "Service Deployment"); + } } @@ -32,10 +44,11 @@ var get_status = session.get("get-status"); var deploy_status = session.get("deploy-status"); var url = ""; - if(get_status != "succeeded" || deploy_status != "succeeded") { - url = request.getContextPath() + '/configure_stratos_wizard.jag?step=' + thisStep; + + if(deploy_status != null && deploy_status != "succeeded") { + url = request.getContextPath() + '/configure_stratos_wizard.jag?step=' + thisStep; } else { - url = request.getContextPath() + '/configure_stratos_wizard.jag?step=' + nextStep; + url = request.getContextPath() + '/configure_stratos_wizard.jag?step=' + nextStep; } if(configuring == "true"){ url = request.getContextPath() + '/configure_stratos.jag?step=' + thisStep; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/53561c36/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js index 69c89e0..52fe3a0 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js @@ -8,6 +8,8 @@ var render = function (theme, data, meta, require) { var isErrGet = false; var isErr = false; var isSucceeded = false; + var artifact_deploy = session.get("deploy_artifacts"); + session.remove("deploy_artifacts"); var wizard_on_val = []; for(var i=0; i<6 ;i++){ if(i <= data.wizard.step-1){ @@ -110,7 +112,7 @@ var render = function (theme, data, meta, require) { error:isErr, deploy_status:isSucceeded, error_msg:err_message, - type:title + type:artifact_deploy } } ], http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/53561c36/components/org.apache.stratos.manager.console/console/util/utility.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/util/utility.jag b/components/org.apache.stratos.manager.console/console/util/utility.jag index fd63c8a..7ab8890 100644 --- a/components/org.apache.stratos.manager.console/console/util/utility.jag +++ b/components/org.apache.stratos.manager.console/console/util/utility.jag @@ -255,15 +255,14 @@ consoleAppUtil = new function(){ default : log.error("Error in the programme flow."); } - log.info("-----------------------:" + stringify(response)); - response = {"data" : {"Error" : {"errorCode" : " 400", "errorMessage" : " Error getting available partitions"}}, "xhr" : {}}; + log.debug("-----------------------:" + stringify(response)); if(response.data.Error) { session.put("get-status", response.data.Error.errorMessage); } else { session.put("get-status", "succeeded"); } - log.info("--------------------: + " + urlPostFix + " "+ session.get("get-status")); + log.debug("--------------------: + " + urlPostFix + " "+ session.get("get-status")); return response; }; @@ -298,8 +297,7 @@ consoleAppUtil = new function(){ } else { session.put("deploy-status", "Error occurred while deploying..."); } - //log.info("sent is: " + stringify(response)); - //log.info("--------------------: + " + urlPostFix + " "+ session.get("deploy-status")); + log.debug("sent is: " + stringify(response)); return response; };
