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 5467918230 for ; Mon, 30 Nov 2015 07:35:08 +0000 (UTC) Received: (qmail 13244 invoked by uid 500); 30 Nov 2015 07:35:08 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 13209 invoked by uid 500); 30 Nov 2015 07:35:08 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 13200 invoked by uid 99); 30 Nov 2015 07:35:08 -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, 30 Nov 2015 07:35:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E0591DFF7B; Mon, 30 Nov 2015 07:35:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anovikov@apache.org To: commits@ignite.apache.org Message-Id: <2abe962ea53a4a509a4f7821252926cc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: IGNITE-843 Minor fix. Date: Mon, 30 Nov 2015 07:35:07 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/ignite-843-rc2 c2efcd405 -> ee17111dc IGNITE-843 Minor fix. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ee17111d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ee17111d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ee17111d Branch: refs/heads/ignite-843-rc2 Commit: ee17111dc51a0aee35f4905b61ea675a1ad2e0d5 Parents: c2efcd4 Author: Andrey Authored: Mon Nov 30 14:35:00 2015 +0700 Committer: Andrey Committed: Mon Nov 30 14:35:00 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/app/modules/Auth/index.js | 9 ++++++--- .../src/main/js/controllers/common-module.js | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ee17111d/modules/control-center-web/src/main/js/app/modules/Auth/index.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/modules/Auth/index.js b/modules/control-center-web/src/main/js/app/modules/Auth/index.js index fd290ce..626b86c 100644 --- a/modules/control-center-web/src/main/js/app/modules/Auth/index.js +++ b/modules/control-center-web/src/main/js/app/modules/Auth/index.js @@ -47,11 +47,14 @@ angular $http.post('/api/v1/' + action, userInfo) .then(User.read) .then(function (user) { - authorized(true); + if (action != 'password/forgot') { + authorized(true); - $state.go('base.configuration.clusters'); + $root.$broadcast('user', user); - $root.$broadcast('user', user); + $state.go('base.configuration.clusters'); + } else + $state.go('password.send'); }) .catch(function (errMsg) { $common.showPopoverMessage(undefined, undefined, 'user_email', errMsg.data); http://git-wip-us.apache.org/repos/asf/ignite/blob/ee17111d/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 2ad9cfb..f4d9428 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 @@ -2032,7 +2032,7 @@ consoleModule.controller('activeLink', [ consoleModule.controller('resetPassword', [ '$scope', '$modal', '$http', '$window', '$common', '$focus', 'Auth', '$state', function ($scope, $http, $common, $focus, Auth, $state) { - if ($state.params.token) + if ($state.params && $state.params.token) $http.post('/api/v1/password/validate-token', {token: $state.params.token}) .success(function (res) { $scope.email = res.email;