You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2016/02/12 02:47:11 UTC
[1/2] ignite git commit: IGNITE-843 Fixed update of next button state
on schema table filtering.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 07b4b8535 -> 5d0fbe561
IGNITE-843 Fixed update of next button state on schema table filtering.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0ea9dbe0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0ea9dbe0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0ea9dbe0
Branch: refs/heads/ignite-843-rc2
Commit: 0ea9dbe064fbe832a5496a145ea8cc147e808f61
Parents: 07b4b85
Author: Vasiliy Sisko <vs...@gridgain.com>
Authored: Fri Feb 12 08:46:01 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Feb 12 08:46:01 2016 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/domains-controller.js | 5 +++--
.../src/main/js/views/configuration/igfs.jade | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0ea9dbe0/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 c427307..cc7ed92 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
@@ -1053,12 +1053,13 @@ consoleModule.controller('domainsController', function ($filter, $http, $timeout
switch ($scope.importDomain.action) {
case 'schemas':
- res = $common.isEmptyArray($scope.importDomain.schemas) || $('#importSchemasData').find(':checked').length > 0;
+ res = $common.isEmptyArray($scope.importDomain.schemas) ||
+ _.find($scope.importDomain.displayedSchemas, {use: true});
break;
case 'tables':
- res = $('#importTableData').find(':checked').length > 0;
+ res = _.find($scope.importDomain.displayedTables, {use: true});
break;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0ea9dbe0/modules/control-center-web/src/main/js/views/configuration/igfs.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/igfs.jade b/modules/control-center-web/src/main/js/views/configuration/igfs.jade
index 1bbff08..1a9d262 100644
--- a/modules/control-center-web/src/main/js/views/configuration/igfs.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/igfs.jade
@@ -23,6 +23,7 @@ include ../includes/infos
+ignite-igfs-information
div(dw-loading='loadingIgfsScreen' dw-loading-options='{text: "Loading IGFS screen...", className: "page-loading-overlay"}')
div(ng-show='ui.ready')
+ hr
+main-table('IGFS', 'igfss', 'igfsName', 'selectItem(row)', '{{$index + 1}}) {{row.name}}', 'name')
.padding-top-dflt(bs-affix)
.panel-tip-container(data-placement='bottom' bs-tooltip='' data-title='Create new IGFS')
[2/2] ignite git commit: IGNITE-2287 Import data only for selected
filtered objects.
Posted by an...@apache.org.
IGNITE-2287 Import data only for selected filtered objects.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5d0fbe56
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5d0fbe56
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5d0fbe56
Branch: refs/heads/ignite-843-rc2
Commit: 5d0fbe56128fce239ff30df11ec653aad5139749
Parents: 0ea9dbe
Author: Vasiliy Sisko <vs...@gridgain.com>
Authored: Fri Feb 12 08:47:15 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Feb 12 08:47:15 2016 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/domains-controller.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5d0fbe56/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 cc7ed92..c04e4d5 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
@@ -616,7 +616,7 @@ consoleModule.controller('domainsController', function ($filter, $http, $timeout
preset.schemas = [];
- _.forEach($scope.importDomain.schemas, function (schema) {
+ _.forEach($scope.importDomain.displayedSchemas, function (schema) {
if (schema.use)
preset.schemas.push(schema.name);
});
@@ -807,7 +807,7 @@ consoleModule.controller('domainsController', function ($filter, $http, $timeout
};
}
- _.forEach($scope.importDomain.tables, function (table) {
+ _.forEach($scope.importDomain.displayedTables, function (table) {
if (table.use) {
var qryFields = [];
var indexes = [];