ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [1/3] ignite git commit: IGNITE-843 Minor fixes.
Date Wed, 14 Oct 2015 09:19:46 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc1 f69fa1fec -> d12dcbbdf


IGNITE-843 Minor fixes.


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

Branch: refs/heads/ignite-843-rc1
Commit: 1d3255e8fbec19cc2f993508da61d7bb0c2c6098
Parents: 78df19b
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Wed Oct 14 16:16:24 2015 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Wed Oct 14 16:16:24 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/metadata-controller.js      | 12 +++++++-----
 .../src/main/js/controllers/models/metadata.json        |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/1d3255e8/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 097c9a9..9e061be 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
@@ -203,7 +203,8 @@ consoleModule.controller('metadataController', [
             };
 
             $scope.selectSchema = function () {
-                $scope.loadMeta.allSchemasSelected = _.every($scope.loadMeta.displayedSchemas,
'use', true);
+                if ($common.isDefined($scope.loadMeta))
+                    $scope.loadMeta.allSchemasSelected = _.every($scope.loadMeta.displayedSchemas,
'use', true);
             };
 
             $scope.selectAllTables = function () {
@@ -215,7 +216,8 @@ consoleModule.controller('metadataController', [
             };
 
             $scope.selectTable = function () {
-                $scope.loadMeta.allTablesSelected = _.every($scope.loadMeta.displayedTables,
'use', true);
+                if ($common.isDefined($scope.loadMeta))
+                    $scope.loadMeta.allTablesSelected = _.every($scope.loadMeta.displayedTables,
'use', true);
             };
 
             $scope.$watch('loadMeta.displayedSchemas', $scope.selectSchema);
@@ -239,7 +241,7 @@ consoleModule.controller('metadataController', [
 
                 function getDrivers(onSuccess, onException) {
                     // Get available JDBC drivers via agent.
-                    $http.post('/agent/drivers', undefined, {timeout: 3000})
+                    $http.post('/agent/drivers', undefined)
                         .success(function (drivers) {
                             onSuccess();
 
@@ -598,8 +600,8 @@ consoleModule.controller('metadataController', [
                 if (containKey)
                     checkOverwrite();
                 else
-                    $confirm.confirm('Imported tables contain tables without primary key.<br/>'
+
-                        'You should manually configure key type and key fields for these
metadata types.')
+                    $confirm.confirm('Some tables have no primary key.<br/>' +
+                        'You will need to configure key type and key fields for such tables
after load complete.')
                         .then(function () { checkOverwrite(); })
             }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/1d3255e8/modules/control-center-web/src/main/js/controllers/models/metadata.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/metadata.json b/modules/control-center-web/src/main/js/controllers/models/metadata.json
index af5eebf..387a02c 100644
--- a/modules/control-center-web/src/main/js/controllers/models/metadata.json
+++ b/modules/control-center-web/src/main/js/controllers/models/metadata.json
@@ -220,7 +220,7 @@
       "items": "jdbcDriverJars",
       "tip": [
         "Select appropriate JAR with JDBC driver",
-        "To add another driver you need to place it into '/drivers' folder of Ignite Web
Agent",
+        "To add another driver you need to place it into '/jdbc-drivers' folder of Ignite
Web Agent",
         "Refer to Ignite Web Agent README.txt for for more information"
       ]
     },


Mime
View raw message