You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2016/01/15 05:29:51 UTC
ignite git commit: IGNITE-843 Fixed typo.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 a6427667a -> c08529959
IGNITE-843 Fixed typo.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c0852995
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c0852995
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c0852995
Branch: refs/heads/ignite-843-rc2
Commit: c085299599905e3d7c9c218c2019cbf3ea8f9ee3
Parents: a642766
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Jan 15 11:30:04 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Jan 15 11:30:04 2016 +0700
----------------------------------------------------------------------
.../main/js/controllers/metadata-controller.js | 46 ++++++++++----------
.../main/js/views/configuration/metadata.jade | 2 +-
2 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c0852995/modules/control-center-web/src/main/js/controllers/metadata-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/metadata-controller.js b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
index 67858d5..f22a8d3 100644
--- a/modules/control-center-web/src/main/js/controllers/metadata-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
@@ -522,33 +522,33 @@ consoleModule.controller('metadataController', function ($filter, $http, $timeou
var preset = $scope.importMeta.demo ? $scope.demoConnection : $scope.selectedPreset;
- if (!$scope.importMeta.demo) {
+ if (!$scope.importMeta.demo)
_savePreset(preset);
- $http.post('/api/v1/agent/schemas', preset)
- .success(function (schemas) {
- $scope.importMeta.schemas = _.map(schemas, function (schema) {
- return {use: false, name: schema};
- });
- $scope.importMeta.action = 'schemas';
+ $http.post('/api/v1/agent/schemas', preset)
+ .success(function (schemas) {
+ $scope.importMeta.schemas = _.map(schemas, function (schema) {
+ return {use: false, name: schema};
+ });
- if ($scope.importMeta.schemas.length === 0)
- $scope.importMetadataNext();
- else
- _.forEach($scope.importMeta.schemas, function (sch) {
- sch.use = true;
- });
+ $scope.importMeta.action = 'schemas';
- $scope.importMeta.info = INFO_SELECT_SCHEMAS;
- $scope.importMeta.loadingOptions = LOADING_TABLES;
- })
- .error(function (errMsg) {
- $common.showError(errMsg);
- })
- .finally(function () {
- $loading.finish('loadingMetadataFromDb');
- });
- }
+ if ($scope.importMeta.schemas.length === 0)
+ $scope.importMetadataNext();
+ else
+ _.forEach($scope.importMeta.schemas, function (sch) {
+ sch.use = true;
+ });
+
+ $scope.importMeta.info = INFO_SELECT_SCHEMAS;
+ $scope.importMeta.loadingOptions = LOADING_TABLES;
+ })
+ .error(function (errMsg) {
+ $common.showError(errMsg);
+ })
+ .finally(function () {
+ $loading.finish('loadingMetadataFromDb');
+ });
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/c0852995/modules/control-center-web/src/main/js/views/configuration/metadata.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/metadata.jade b/modules/control-center-web/src/main/js/views/configuration/metadata.jade
index 71fee9f..0dce34c 100644
--- a/modules/control-center-web/src/main/js/views/configuration/metadata.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/metadata.jade
@@ -68,7 +68,7 @@ include ../includes/controls
.panel-tip-container(bs-tooltip='' data-title='Import metadata from database' data-placement='bottom')
button.btn.btn-primary(ng-click='showImportMetadataModal(false)') Import from database
+save-remove-buttons('metadata')
- .btn-group.btn-last.panel-tip-container.pull-right(bs-tooltip='' data-title='Import metadata from demo database' data-placement='bottom')
+ .btn-group.panel-tip-container.pull-right(bs-tooltip='' data-title='Import metadata from demo database' data-placement='bottom')
button.btn.btn-info(ng-click='showImportMetadataModal(true)') Demo
button.btn.dropdown-toggle.btn-info(id='remove-demo-dropdown' ng-if='hasDemoItems()' data-toggle='dropdown' data-container='body' bs-dropdown='removeDemoDropdown' data-placement='bottom-right')
span.caret