ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: IGNITE-843 Minor changes to import domain modal.
Date Mon, 08 Feb 2016 12:54:57 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 ace9ef73a -> 75d8a2a54


IGNITE-843 Minor changes to import domain modal.


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

Branch: refs/heads/ignite-843-rc2
Commit: 75d8a2a54c83633eca4b1f11e1c059ef80a98245
Parents: ace9ef7
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Mon Feb 8 19:54:49 2016 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Mon Feb 8 19:54:49 2016 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/domains-controller.js     |  9 ++++-----
 .../main/js/views/configuration/domains-import.jade   | 14 +++++++-------
 2 files changed, 11 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/75d8a2a5/modules/control-center-web/src/main/js/controllers/domains-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/domains-controller.js b/modules/control-center-web/src/main/js/controllers/domains-controller.js
index a3f04f8..066bca9 100644
--- a/modules/control-center-web/src/main/js/controllers/domains-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/domains-controller.js
@@ -441,7 +441,7 @@ consoleModule.controller('domainsController', function ($filter, $http,
$timeout
                 $scope.importDomain = {
                     demo: demo,
                     action: 'drivers',
-                    jdbcDriversFound: false,
+                    jdbcDriversNotFound: false,
                     schemas: [],
                     allSchemasSelected: false,
                     tables: [],
@@ -476,8 +476,6 @@ consoleModule.controller('domainsController', function ($filter, $http,
$timeout
                                 }
 
                                 if (drivers && drivers.length > 0) {
-                                    $scope.importDomain.jdbcDriversFound = true;
-
                                     drivers = _.sortBy(drivers, 'jdbcDriverJar');
 
                                     if ($scope.importDomain.demo) {
@@ -519,6 +517,7 @@ consoleModule.controller('domainsController', function ($filter, $http,
$timeout
                                     });
                                 }
                                 else {
+                                    $scope.importDomain.jdbcDriversNotFound = true;
                                     $scope.importDomain.button = 'Cancel';
                                 }
                             })
@@ -984,7 +983,7 @@ consoleModule.controller('domainsController', function ($filter, $http,
$timeout
 
             var act = $scope.importDomain.action;
 
-            if (act === 'drivers' && !$scope.importDomain.jdbcDriversFound)
+            if (act === 'drivers' && $scope.importDomain.jdbcDriversNotFound)
                 importDomainModal.hide();
             else if (act === 'connect') {
                 if ($scope.importDomain.demo && $scope.demoConnection.db !== 'H2')
@@ -1005,7 +1004,7 @@ consoleModule.controller('domainsController', function ($filter, $http,
$timeout
 
             var act = $scope.importDomain.action;
 
-            if (act === 'drivers' && !$scope.importDomain.jdbcDriversFound)
+            if (act === 'drivers' && $scope.importDomain.jdbcDriversNotFound)
                 return 'Resolve issue with JDBC drivers<br>Close this dialog and try
again';
 
             if (act === 'connect') {

http://git-wip-us.apache.org/repos/asf/ignite/blob/75d8a2a5/modules/control-center-web/src/main/js/views/configuration/domains-import.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/domains-import.jade
b/modules/control-center-web/src/main/js/views/configuration/domains-import.jade
index 3bd9688..790a789 100644
--- a/modules/control-center-web/src/main/js/views/configuration/domains-import.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/domains-import.jade
@@ -30,13 +30,13 @@ mixin td-ellipses-lbl(w, lbl)
                 button.close(ng-click='$hide()' aria-hidden='true') &times;
                 h4.modal-title(ng-if='!importDomain.demo') Import domain models from database
                 h4.modal-title(ng-if='importDomain.demo') Import domain models from demo
database
-            .import-domain-model-wizard-page(ng-show='importDomain.action == "drivers"' style='margin-bottom:
256px')
-                div(ng-if='!importDomain.jdbcDriversFound')
-                    label Domain model could not be imported
-                        ul
-                            li Agent not found JDBC drivers
-                            li Copy required JDBC drivers into agent '\jdbc-drivers' folder
and try again
-                            li Refer to agent README.txt for more information
+            .import-domain-model-wizard-page(ng-if='importDomain.action == "drivers" &&
!importDomain.jdbcDriversNotFound' style='margin-bottom: 321px')
+            .import-domain-model-wizard-page(ng-if='importDomain.action == "drivers" &&
importDomain.jdbcDriversNotFound' style='margin-bottom: 220px')
+                | Domain model could not be imported
+                ul
+                    li Agent failed to find JDBC drivers
+                    li Copy required JDBC drivers into agent '\jdbc-drivers' folder and try
again
+                    li Refer to agent README.txt for more information
             .import-domain-model-wizard-page(ng-show='importDomain.action == "connect" &&
importDomain.demo' style='margin-bottom: 211px')
                 div(ng-if='demoConnection.db == "H2"')
                     label Demo description:


Mime
View raw message