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 2015/12/02 10:55:04 UTC
[1/2] ignite git commit: IGNITE-843 Fixed notebook dropdown.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 7b1acaf67 -> 654bd337f
IGNITE-843 Fixed notebook dropdown.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8cb63e0e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8cb63e0e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8cb63e0e
Branch: refs/heads/ignite-843-rc2
Commit: 8cb63e0eb284e5ccfc25605886222f4f5c9ec48b
Parents: 7530ec1
Author: Andrey <an...@gridgain.com>
Authored: Wed Dec 2 16:54:40 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Dec 2 16:54:40 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/common-module.js | 2 ++
.../src/main/js/controllers/sql-controller.js | 12 +++++++++---
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8cb63e0e/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 649628e..227ee28 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
@@ -2271,6 +2271,8 @@ consoleModule.controller('notebooks', ['$scope', '$modal', '$state', '$http', '$
.success(function (id) {
_notebookNewModal.hide();
+ $scope.$root.reloadNotebooks();
+
$state.go('base.sql', {id: id});
})
.error(function (message, state) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/8cb63e0e/modules/control-center-web/src/main/js/controllers/sql-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js
index 5eef298..781fc2d 100644
--- a/modules/control-center-web/src/main/js/controllers/sql-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js
@@ -322,10 +322,12 @@ consoleModule.controller('sqlController', function ($scope, $controller, $http,
if (idx >= 0) {
$scope.$root.notebooks.splice(idx, 1);
+ $scope.$root.rebuildDropdown();
+
if ($scope.$root.notebooks.length > 0)
- $state.go('/sql', {id: $scope.$root.notebooks[Math.min(idx, $scope.$root.notebooks.length - 1)]._id});
+ $state.go('base.sql', {id: $scope.$root.notebooks[Math.min(idx, $scope.$root.notebooks.length - 1)]._id});
else
- $state.go('/configuration/clusters');
+ $state.go('base.configuration.clusters');
}
})
.error(function (errMsg) {
@@ -374,7 +376,11 @@ consoleModule.controller('sqlController', function ($scope, $controller, $http,
$scope.notebook.paragraphs.push(paragraph);
- $scope.notebook.activePanels.push($scope.notebook.paragraphs.length);
+ var _activePanels = angular.copy($scope.notebook.activePanels);
+
+ _activePanels.push(sz);
+
+ $scope.notebook.activePanels = _activePanels;
$scope.rebuildScrollParagraphs();
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843-rc2' into ignite-843-rc2
Posted by an...@apache.org.
Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/654bd337
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/654bd337
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/654bd337
Branch: refs/heads/ignite-843-rc2
Commit: 654bd337f9fdad1fcab6024f651f71f4729b4df7
Parents: 8cb63e0 7b1acaf
Author: Andrey <an...@gridgain.com>
Authored: Wed Dec 2 16:54:58 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Dec 2 16:54:58 2015 +0700
----------------------------------------------------------------------
.../main/js/controllers/summary-controller.js | 30 +++++---
.../main/js/helpers/generator/generator-java.js | 74 +++++++++-----------
2 files changed, 54 insertions(+), 50 deletions(-)
----------------------------------------------------------------------