Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 edb80e605 -> 6aacd0add
IGNITE-843 Rename user_info to reset_info. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6aacd0ad Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6aacd0ad Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6aacd0ad Branch: refs/heads/ignite-843 Commit: 6aacd0addcc01f024fd4b396a70eddfd99afc6a6 Parents: edb80e6 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Fri Aug 7 10:21:52 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Fri Aug 7 10:21:52 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/common-module.js | 4 ++-- modules/control-center-web/src/main/js/views/reset.jade | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6aacd0ad/modules/control-center-web/src/main/js/controllers/common-module.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js index ef3f5ba..96947dd 100644 --- a/modules/control-center-web/src/main/js/controllers/common-module.js +++ b/modules/control-center-web/src/main/js/controllers/common-module.js @@ -643,8 +643,8 @@ controlCenterModule.controller('auth', ['$scope', '$modal', '$http', '$window', }; // Try to reset user password for provided token. - $scope.resetPassword = function (user_info) { - $http.post('/reset_password', user_info) + $scope.resetPassword = function (reset_info) { + $http.post('/reset_password', reset_info) .success(function (data) { $scope.user_info = {email: data}; $scope.login(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6aacd0ad/modules/control-center-web/src/main/js/views/reset.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/reset.jade b/modules/control-center-web/src/main/js/views/reset.jade index 778c5e3..670f512 100644 --- a/modules/control-center-web/src/main/js/views/reset.jade +++ b/modules/control-center-web/src/main/js/views/reset.jade @@ -23,16 +23,16 @@ block container .text-center(ng-if='error') p {{::error}} div(ng-controller='auth' ng-if='token && !error') - form.form-horizontal(name='resetForm' ng-init='user_info.token = token') + form.form-horizontal(name='resetForm' ng-init='reset_info.token = token') .settings-row label.col-sm-1 Token: label {{::token}} .settings-row label.col-sm-1.required Password: .col-sm-3 - input#user_password.form-control(enter-focus-next enter-focus-next-id='user_confirm' type='password' ng-model='user_info.password' placeholder='New password' required) + input#user_password.form-control(enter-focus-next enter-focus-next-id='user_confirm' type='password' ng-model='reset_info.password' placeholder='New password' required) .settings-row label.col-sm-1.required Confirm: .col-sm-3 - input#user_confirm.form-control(type='password' ng-model='user_info.confirm' match='user_info.password' placeholder='Confirm new password' required on-enter='resetForm.$valid && resetPassword(user_info)') - button.btn.btn-primary(ng-disabled='resetForm.$invalid' ng-click='resetPassword(user_info)') Reset Password + input#user_confirm.form-control(type='password' ng-model='user_info.confirm' match='reset_info.password' placeholder='Confirm new password' required on-enter='resetForm.$valid && resetPassword(user_info)') + button.btn.btn-primary(ng-disabled='resetForm.$invalid' ng-click='resetPassword(reset_info)') Reset Password
