Updated Branches: refs/heads/master c17d678a5 -> f7daf5633
fixing tenant login issue and adding password feild for new tenant page Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/05638953 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/05638953 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/05638953 Branch: refs/heads/master Commit: 0563895387df3e2c6b5b5c0ffda4de9ccaaeede1 Parents: 4886e11 Author: rekathiru <[email protected]> Authored: Tue Feb 11 18:08:06 2014 +0530 Committer: rekathiru <[email protected]> Committed: Tue Feb 11 18:08:06 2014 +0530 ---------------------------------------------------------------------- .../console/controllers/cartridgeDefintionSubmit.jag | 2 +- .../console/controllers/loginSubmit.jag | 2 +- .../console/themes/theme1/partials/tenant_new.hbs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/05638953/components/org.apache.stratos.manager.console/console/controllers/cartridgeDefintionSubmit.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/cartridgeDefintionSubmit.jag b/components/org.apache.stratos.manager.console/console/controllers/cartridgeDefintionSubmit.jag index 6ab2455..e283e23 100755 --- a/components/org.apache.stratos.manager.console/console/controllers/cartridgeDefintionSubmit.jag +++ b/components/org.apache.stratos.manager.console/console/controllers/cartridgeDefintionSubmit.jag @@ -3,7 +3,7 @@ var log = new Log("controller.cartridgeDefinitionSubmit"); var utils = require('/util/utility.jag'); var cartridgeDefinition = request.getParameter("cartridge-definition").trim(); - utils.consoleAppUtil.deployCartridgeDefinition(cartridgeDefinition); + var response = utils.consoleAppUtil.deployCartridgeDefinition(cartridgeDefinition); response.sendRedirect(request.getContextPath() + '/cartridge_deployments.jag'); }()); %> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/05638953/components/org.apache.stratos.manager.console/console/controllers/loginSubmit.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/loginSubmit.jag b/components/org.apache.stratos.manager.console/console/controllers/loginSubmit.jag index a9369c9..6ccbd52 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/loginSubmit.jag +++ b/components/org.apache.stratos.manager.console/console/controllers/loginSubmit.jag @@ -19,7 +19,7 @@ }else{ var userObject = carbon.server.tenantUser(username); var um = new carbon.user.UserManager({}, userObject.tenantId); - var user = um.getUser('admin'); + var user = um.getUser(userObject.username); var roles = user.getRoles(); //storing in session session.put("USER_NAME",username); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/05638953/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs index fed17e3..e3b9306 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs @@ -40,11 +40,11 @@ <div class="col-md-3 padding-remover-left"> <label class="required">Admin Password:</label> - <input name="adminPassword" type="text"/> + <input name="adminPassword" type="password"/> </div> <div class="col-md-3"> <label class="required">Admin Password (Repeat):</label> - <input type="text"/> + <input type="password"/> </div> <div class="clearfix"></div>
