You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2016/09/08 04:46:49 UTC
[32/50] [abbrv] ignite git commit: IGNITE-3803 Fixed blinking signin
page for authorized user.
IGNITE-3803 Fixed blinking signin page for authorized user.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/76f7eabc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/76f7eabc
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/76f7eabc
Branch: refs/heads/ignite-3629
Commit: 76f7eabca16e345792b344cec6ed251c2ad6caa9
Parents: 4167196
Author: Maxim Afanasiev <ma...@gmail.com>
Authored: Wed Aug 31 15:32:54 2016 +0700
Committer: Maxim Afanasiev <ma...@gmail.com>
Committed: Wed Aug 31 15:32:54 2016 +0700
----------------------------------------------------------------------
.../frontend/app/modules/states/signin.state.js | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/76f7eabc/modules/web-console/frontend/app/modules/states/signin.state.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/states/signin.state.js b/modules/web-console/frontend/app/modules/states/signin.state.js
index ec62af5..14ebc1b 100644
--- a/modules/web-console/frontend/app/modules/states/signin.state.js
+++ b/modules/web-console/frontend/app/modules/states/signin.state.js
@@ -30,10 +30,13 @@ angular
.state('signin', {
url: '/',
templateUrl,
- onEnter: ['$state', 'User', ($state, User) => {
- User.read()
- .then(() => $state.go('base.configuration.clusters', {}, {reload: true}));
- }],
+ resolve: {
+ user: ['$state', 'User', ($state, User) => {
+ return User.read()
+ .then(() => $state.go('base.configuration.clusters'))
+ .catch(() => {});
+ }]
+ },
metaTags: {
}
});