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:54 UTC
[37/50] [abbrv] ignite git commit: GG-11489 Fixed terms page
permission.
GG-11489 Fixed terms page permission.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a0d985d5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a0d985d5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a0d985d5
Branch: refs/heads/ignite-3629
Commit: a0d985d5adedb4df182d7c911a8143fed89d92a6
Parents: 957d472
Author: Andrey Novikov <an...@apache.org>
Authored: Mon Sep 5 17:24:45 2016 +0700
Committer: Andrey Novikov <an...@apache.org>
Committed: Mon Sep 5 17:24:45 2016 +0700
----------------------------------------------------------------------
modules/web-console/frontend/app/app.js | 5 ++---
modules/web-console/frontend/app/modules/agent/agent.module.js | 3 +++
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0d985d5/modules/web-console/frontend/app/app.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/app.js b/modules/web-console/frontend/app/app.js
index e5ea8ca..45851a2 100644
--- a/modules/web-console/frontend/app/app.js
+++ b/modules/web-console/frontend/app/app.js
@@ -246,9 +246,8 @@ angular
$root.$meta = $meta;
$root.gettingStarted = gettingStarted;
}])
-.run(['$rootScope', 'User', 'IgniteAgentMonitor', ($root, User, agentMonitor) => {
- User.read()
- .then(() => agentMonitor.init());
+.run(['$rootScope', 'IgniteAgentMonitor', ($root, agentMonitor) => {
+ $root.$on('user', () => agentMonitor.init());
}])
.run(['$rootScope', ($root) => {
$root.$on('$stateChangeStart', () => {
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0d985d5/modules/web-console/frontend/app/modules/agent/agent.module.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/agent/agent.module.js b/modules/web-console/frontend/app/modules/agent/agent.module.js
index f65781e..22ced13 100644
--- a/modules/web-console/frontend/app/modules/agent/agent.module.js
+++ b/modules/web-console/frontend/app/modules/agent/agent.module.js
@@ -126,6 +126,9 @@ class IgniteAgentMonitor {
}
init() {
+ if (this._socket)
+ return;
+
this._socket = this._socketFactory();
const disconnectFn = () => {