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 2015/09/14 12:09:45 UTC
ignite git commit: IGNITE-843 Fixed metadata screen issues.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 bd5fbd4cb -> 76f4b834f
IGNITE-843 Fixed metadata screen issues.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/76f4b834
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/76f4b834
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/76f4b834
Branch: refs/heads/ignite-843
Commit: 76f4b834fd496e24bbef0291c325c6139713bacc
Parents: bd5fbd4
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Mon Sep 14 17:10:25 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Mon Sep 14 17:10:25 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/common-module.js | 23 +++++++++--
.../main/js/controllers/metadata-controller.js | 42 ++++++++++----------
2 files changed, 41 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/76f4b834/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js
index f1b6f8a..9e163ea 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -139,9 +139,26 @@ controlCenterModule.service('$common', [
}
var SUPPORTED_JDBC_TYPES = [
- 'BIT', 'BOOLEAN', 'TINYINT', 'SMALLINT', 'INTEGER', 'BIGINT', 'REAL', 'FLOAT', 'DOUBLE',
- 'NUMERIC', 'DECIMAL', 'CHAR', 'VARCHAR', 'LONGVARCHAR', 'NCHAR', 'NVARCHAR', 'LONGNVARCHAR',
- 'DATE', 'TIME', 'TIMESTAMP'
+ 'BIGINT',
+ 'BIT',
+ 'BOOLEAN',
+ 'CHAR',
+ 'DATE',
+ 'DECIMAL',
+ 'DOUBLE',
+ 'FLOAT',
+ 'INTEGER',
+ 'LONGNVARCHAR',
+ 'LONGVARCHAR',
+ 'NCHAR',
+ 'NUMERIC',
+ 'NVARCHAR',
+ 'REAL',
+ 'SMALLINT',
+ 'TIME',
+ 'TIMESTAMP',
+ 'TINYINT',
+ 'VARCHAR'
];
var ALL_JDBC_TYPES = [
http://git-wip-us.apache.org/repos/asf/ignite/blob/76f4b834/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 c151054..17dc008 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
@@ -483,24 +483,24 @@ controlCenterModule.controller('metadataController', [
});
}
- var metaName = toProperCase(tableName);
-
var metaFound = _.find($scope.metadatas, function (meta) {
- return meta.name == metaName;
+ return meta.valueType == valType;
});
- var meta = {space: $scope.spaces[0], name: metaName};
-
- meta.databaseSchema = table.schema;
- meta.databaseTable = tableName;
- meta.keyType = valType + 'Key';
- meta.valueType = valType;
- meta.queryFields = qryFields;
- meta.ascendingFields = ascFields;
- meta.descendingFields = descFields;
- meta.groups = groups;
- meta.keyFields = keyFields;
- meta.valueFields = valFields;
+ var meta = {
+ space: $scope.spaces[0],
+ caches: [],
+ keyType: valType + 'Key',
+ valueType: valType,
+ databaseSchema: table.schema,
+ databaseTable: tableName,
+ queryFields: qryFields,
+ ascendingFields: ascFields,
+ descendingFields: descFields,
+ groups: groups,
+ keyFields: keyFields,
+ valueFields: valFields
+ };
if ($common.isDefined(metaFound))
delayed.push([metaFound, meta]);
@@ -670,7 +670,7 @@ controlCenterModule.controller('metadataController', [
$common.confirmUnsavedChanges($scope.ui.isDirty(), selectItem);
$scope.ui.formTitle = $common.isDefined($scope.backupItem) && $scope.backupItem._id
- ? 'Selected metadata: ' + $scope.backupItem.name
+ ? 'Selected metadata: ' + $scope.backupItem.valueType
: 'New metadata';
};
@@ -775,7 +775,7 @@ controlCenterModule.controller('metadataController', [
}
if (!quiet)
- $common.showInfo('Cache type metadata"' + item.name + '" saved.');
+ $common.showInfo('Cache type metadata"' + item.valueType + '" saved.');
})
.error(function (errMsg) {
$common.showError(errMsg);
@@ -797,11 +797,11 @@ controlCenterModule.controller('metadataController', [
$table.tableReset();
if (validate($scope.backupItem))
- $copy.show($scope.backupItem.name).then(function (newName) {
+ $copy.show($scope.backupItem.valueType).then(function (newName) {
var item = angular.copy($scope.backupItem);
item._id = undefined;
- item.name = newName;
+ item.valueType = newName;
save(item);
});
@@ -813,7 +813,7 @@ controlCenterModule.controller('metadataController', [
var selectedItem = $scope.selectedItem;
- $confirm.show('Are you sure you want to remove cache type metadata: "' + selectedItem.name + '"?').then(
+ $confirm.show('Are you sure you want to remove cache type metadata: "' + selectedItem.valueType + '"?').then(
function () {
var _id = selectedItem._id;
@@ -821,7 +821,7 @@ controlCenterModule.controller('metadataController', [
.success(function () {
$scope.ui.markPristine(0);
- $common.showInfo('Cache type metadata has been removed: ' + selectedItem.name);
+ $common.showInfo('Cache type metadata has been removed: ' + selectedItem.valueType);
var metadatas = $scope.metadatas;