Return-Path: <commits-return-104692-archive-asf-public=cust-asf.ponee.io@ignite.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 65F8E200C72
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Thu,  6 Apr 2017 12:45:40 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 64DBB160BCD; Thu,  6 Apr 2017 10:45:40 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 83C1F160BAF
	for <archive-asf-public@cust-asf.ponee.io>; Thu,  6 Apr 2017 12:45:39 +0200 (CEST)
Received: (qmail 76513 invoked by uid 500); 6 Apr 2017 10:45:38 -0000
Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ignite.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ignite.apache.org>
List-Post: <mailto:commits@ignite.apache.org>
List-Id: <commits.ignite.apache.org>
Reply-To: dev@ignite.apache.org
Delivered-To: mailing list commits@ignite.apache.org
Received: (qmail 76056 invoked by uid 99); 6 Apr 2017 10:45:38 -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; Thu, 06 Apr 2017 10:45:38 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 46031DFC8E; Thu,  6 Apr 2017 10:45:38 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: agoncharuk@apache.org
To: commits@ignite.apache.org
Date: Thu, 06 Apr 2017 10:45:49 -0000
Message-Id: <e97fcf221bbe4477862a2353e0f9128e@git.apache.org>
In-Reply-To: <903a34b865e9411d913d7f14895c3ac5@git.apache.org>
References: <903a34b865e9411d913d7f14895c3ac5@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [12/50] [abbrv] ignite git commit: IGNITE-4855 Fixed error on
 switching between notebooks.
archived-at: Thu, 06 Apr 2017 10:45:40 -0000

IGNITE-4855 Fixed error on switching between notebooks.

(cherry picked from commit 6a148e2)


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ec7b9d84
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ec7b9d84
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ec7b9d84

Branch: refs/heads/ignite-3477-master
Commit: ec7b9d848274b229b69dc7b8a20902654f719c44
Parents: eb837c7
Author: Andrey Novikov <anovikov@gridgain.com>
Authored: Thu Mar 23 09:32:38 2017 +0700
Committer: Andrey Novikov <anovikov@gridgain.com>
Committed: Thu Mar 23 09:34:41 2017 +0700

----------------------------------------------------------------------
 .../web-console/frontend/app/modules/sql/sql.module.js  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/ec7b9d84/modules/web-console/frontend/app/modules/sql/sql.module.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/sql/sql.module.js b/modules/web-console/frontend/app/modules/sql/sql.module.js
index 670e4f4..79614c2 100644
--- a/modules/web-console/frontend/app/modules/sql/sql.module.js
+++ b/modules/web-console/frontend/app/modules/sql/sql.module.js
@@ -34,9 +34,7 @@ angular.module('ignite-console.sql', [
                 .state('base.sql', {
                     url: '/queries',
                     abstract: true,
-                    template: '<ui-view></ui-view>',
-                    controller,
-                    controllerAs: '$ctrl'
+                    template: '<ui-view></ui-view>'
                 })
                 .state('base.sql.notebook', {
                     url: '/notebook/{noteId}',
@@ -44,7 +42,9 @@ angular.module('ignite-console.sql', [
                     onEnter: AclRoute.checkAccess('query'),
                     metaTags: {
                         title: 'Query notebook'
-                    }
+                    },
+                    controller,
+                    controllerAs: '$ctrl'
                 })
                 .state('base.sql.demo', {
                     url: '/demo',
@@ -52,7 +52,9 @@ angular.module('ignite-console.sql', [
                     onEnter: AclRoute.checkAccess('query'),
                     metaTags: {
                         title: 'SQL demo'
-                    }
+                    },
+                    controller,
+                    controllerAs: '$ctrl'
                 });
         }]
     )