Repository: ignite Updated Branches: refs/heads/ignite-843 110ddb9f0 -> 1ed67a16c
# IGNITE-843 Updated sql page. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1ed67a16 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1ed67a16 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1ed67a16 Branch: refs/heads/ignite-843 Commit: 1ed67a16c00df32aeaf26e39fff25eb51136119f Parents: 110ddb9 Author: Andrey <[email protected]> Authored: Wed Sep 2 16:16:31 2015 +0700 Committer: Andrey <[email protected]> Committed: Wed Sep 2 16:16:31 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/sql-controller.js | 10 ++++------ modules/control-center-web/src/main/js/db.js | 3 ++- modules/control-center-web/src/main/js/views/sql/sql.jade | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/1ed67a16/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 93c3185..41be866 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 @@ -40,8 +40,6 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle $scope.notebook_name = notebook.name; - $scope.notebook.activeIdx = []; - if (!notebook.paragraphs || notebook.paragraphs.length == 0) $scope.addParagraph(); }) @@ -140,12 +138,12 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle var sz = $scope.notebook.paragraphs.length; - var paragraph = {name: 'Query' + (sz ==0 ? '' : sz), editor: true, query: '', pageSize: $scope.pageSizes[0]}; + var paragraph = {name: 'Query' + (sz ==0 ? '' : sz), editor: true, query: '', pageSize: $scope.pageSizes[0], result: 'none'}; if ($scope.caches && $scope.caches.length > 0) paragraph.cache = $scope.caches[0]; - $scope.notebook.activeIdx.push($scope.notebook.paragraphs.length); + $scope.notebook.expandedParagraphs.push($scope.notebook.paragraphs.length); $scope.notebook.paragraphs.push(paragraph); }; @@ -187,14 +185,14 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle return paragraph == item; }); - var panel_idx = _.findIndex($scope.notebook.activeIdx, function (item) { + var panel_idx = _.findIndex($scope.notebook.expandedParagraphs, function (item) { console.log(item); return paragraph_idx == item; }); if (panel_idx >= 0) - $scope.notebook.activeIdx.splice(panel_idx, 1); + $scope.notebook.expandedParagraphs.splice(panel_idx, 1); $scope.notebook.paragraphs.splice(paragraph_idx, 1); }; http://git-wip-us.apache.org/repos/asf/ignite/blob/1ed67a16/modules/control-center-web/src/main/js/db.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/db.js b/modules/control-center-web/src/main/js/db.js index 84529a4..8aee6ec 100644 --- a/modules/control-center-web/src/main/js/db.js +++ b/modules/control-center-web/src/main/js/db.js @@ -345,11 +345,12 @@ exports.Cluster = mongoose.model('Cluster', ClusterSchema); var NotebookSchema = new Schema({ space: {type: ObjectId, ref: 'Space'}, name: String, + expandedParagraphs: [Number], paragraphs: [{ name: String, query: String, editor: Boolean, - result: {type: String, enum: ['none', 'table', 'bar']}, + result: {type: String, enum: ['none', 'table', 'bar', 'pie', 'line', 'area']}, pageSize: Number }] }); http://git-wip-us.apache.org/repos/asf/ignite/blob/1ed67a16/modules/control-center-web/src/main/js/views/sql/sql.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/sql/sql.jade b/modules/control-center-web/src/main/js/views/sql/sql.jade index 84bcad2..19344fa 100644 --- a/modules/control-center-web/src/main/js/views/sql/sql.jade +++ b/modules/control-center-web/src/main/js/views/sql/sql.jade @@ -45,7 +45,7 @@ block container i.tipField.fa.fa-plus(ng-click='addParagraph()' bs-tooltip data-title='Add new paragraph' data-trigger='hover') .docs-body(style='margin-top: 20px;') hr - .panel-group(bs-collapse ng-model='notebook.activeIdx' data-allow-multiple='true' data-start-collapsed='false') + .panel-group(bs-collapse ng-model='notebook.expandedParagraphs' data-allow-multiple='true' data-start-collapsed='false') .panel.panel-default(ng-repeat='paragraph in notebook.paragraphs') .panel-heading(bs-collapse-toggle) div(ng-hide='paragraph.edit')
