Repository: ignite Updated Branches: refs/heads/ignite-843 75afa7074 -> fdfbc6dfd
IGNITE-843 Fixed show load metadata dialog. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fdfbc6df Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fdfbc6df Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fdfbc6df Branch: refs/heads/ignite-843 Commit: fdfbc6dfd57174ee5ebf91ac317c5aecdcbf894d Parents: 75afa70 Author: AKuznetsov <[email protected]> Authored: Fri Sep 11 19:19:36 2015 +0700 Committer: AKuznetsov <[email protected]> Committed: Fri Sep 11 19:19:36 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/metadata-controller.js | 16 ++++++++++------ .../src/main/js/views/includes/controls.jade | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fdfbc6df/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 5cd8e69..5912c21 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 @@ -251,14 +251,18 @@ controlCenterModule.controller('metadataController', [ $scope.preset.jdbcDriverJar = drivers[0].jdbcDriverJar; - loadMetaModal.$promise.then(function () { - $scope.loadMeta.action = 'connect'; - $scope.loadMeta.tables = []; + function openLoadMetadataModal() { + loadMetaModal.$promise.then(function () { + $scope.loadMeta.action = 'connect'; + $scope.loadMeta.tables = []; - $common.confirmUnsavedChanges($scope.ui.isDirty(), selectItem); + loadMetaModal.show(); - $focus('jdbcUrl'); - }); + $focus('jdbcUrl'); + }); + } + + $common.confirmUnsavedChanges($scope.ui.isDirty(), openLoadMetadataModal); } else $common.showError('JDBC drivers not found!'); http://git-wip-us.apache.org/repos/asf/ignite/blob/fdfbc6df/modules/control-center-web/src/main/js/views/includes/controls.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/includes/controls.jade b/modules/control-center-web/src/main/js/views/includes/controls.jade index bbdf918..69723a1 100644 --- a/modules/control-center-web/src/main/js/views/includes/controls.jade +++ b/modules/control-center-web/src/main/js/views/includes/controls.jade @@ -261,7 +261,7 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource) label(id='{{::field.id}}') input(type='checkbox' ng-disabled=fieldDisabled)&attributes(fieldCommon) | {{::field.label}} - +tipLabel('field.tip') + +tipLabel('field.tip') div(ng-switch-when='text' ng-hide=fieldHide) label(class=lblClasses ng-class=fieldRequiredClass) {{::field.label}}: div(class=fieldClasses)
