Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 08B0918F99 for ; Mon, 10 Aug 2015 16:00:58 +0000 (UTC) Received: (qmail 99013 invoked by uid 500); 10 Aug 2015 16:00:55 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 98970 invoked by uid 500); 10 Aug 2015 16:00:55 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 98934 invoked by uid 99); 10 Aug 2015 16:00:55 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Aug 2015 16:00:55 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id CA4BCC12D8 for ; Mon, 10 Aug 2015 16:00:54 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id L7_A2xbAJvNo for ; Mon, 10 Aug 2015 16:00:53 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 5C58531C0A for ; Mon, 10 Aug 2015 16:00:44 +0000 (UTC) Received: (qmail 96733 invoked by uid 99); 10 Aug 2015 16:00:44 -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; Mon, 10 Aug 2015 16:00:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 24595E050A; Mon, 10 Aug 2015 16:00:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sevdokimov@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 10 Aug 2015 16:01:05 -0000 Message-Id: <6478221eea7645839e9b34cb20f8ff51@git.apache.org> In-Reply-To: <23b0f4c8a90b4e03b1b4ca5f19326ecd@git.apache.org> References: <23b0f4c8a90b4e03b1b4ca5f19326ecd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [23/34] incubator-ignite git commit: IGNITE-843 Rename user_info to reset_info. 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-1201 Commit: 6aacd0addcc01f024fd4b396a70eddfd99afc6a6 Parents: edb80e6 Author: AKuznetsov Authored: Fri Aug 7 10:21:52 2015 +0700 Committer: AKuznetsov 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