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 2016/02/24 14:22:45 UTC
[1/5] ignite git commit: IGNITE-843 Fixed "JQuery is not a function"
+ added missing affix fix on Domains screen.
Repository: ignite
Updated Branches:
refs/heads/ignite-2612 ade3c4a52 -> 9700b7c0d
IGNITE-843 Fixed "JQuery is not a function" + added missing affix fix on Domains screen.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1b214b0e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1b214b0e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1b214b0e
Branch: refs/heads/ignite-2612
Commit: 1b214b0ef904474e9e1a58af4e365eece2757b8d
Parents: daccaef
Author: Dmitriyff <dm...@gmail.com>
Authored: Wed Feb 24 16:29:25 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Feb 24 16:29:25 2016 +0700
----------------------------------------------------------------------
.../app/directives/bs-affix-update/bs-affix-update.directive.js | 4 ++--
.../src/main/js/views/configuration/domains.jade | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1b214b0e/modules/control-center-web/src/main/js/app/directives/bs-affix-update/bs-affix-update.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/bs-affix-update/bs-affix-update.directive.js b/modules/control-center-web/src/main/js/app/directives/bs-affix-update/bs-affix-update.directive.js
index 131089d..dbf78e5 100644
--- a/modules/control-center-web/src/main/js/app/directives/bs-affix-update/bs-affix-update.directive.js
+++ b/modules/control-center-web/src/main/js/app/directives/bs-affix-update/bs-affix-update.directive.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import jQuery from 'jquery';
+import angular from 'angular';
export default ['igniteBsAffixUpdate', ['$window', '$timeout', ($window, $timeout) => {
let update = null;
@@ -23,7 +23,7 @@ export default ['igniteBsAffixUpdate', ['$window', '$timeout', ($window, $timeou
const link = ({$last}) => {
if ($last) {
update && $timeout.cancel(update);
- update = $timeout(() => jQuery($window).trigger('resize'), 1000);
+ update = $timeout(() => angular.element($window).triggerHandler('resize'), 1000);
}
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/1b214b0e/modules/control-center-web/src/main/js/views/configuration/domains.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/domains.jade b/modules/control-center-web/src/main/js/views/configuration/domains.jade
index 395ead1..0dd39a0 100644
--- a/modules/control-center-web/src/main/js/views/configuration/domains.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/domains.jade
@@ -44,7 +44,7 @@ include ../includes/infos
.scrollable-y(ng-show='(displayedRows | domainsValidation:ui.showValid:true).length > 0' style='max-height: 200px')
table
tbody
- tr(ng-repeat='row in (displayedRows | domainsValidation:ui.showValid:true) track by row._id')
+ tr(ng-repeat='row in (displayedRows | domainsValidation:ui.showValid:true) track by row._id' ignite-bs-affix-update)
td
a(ng-class='{active: row._id == selectedItem._id}' ng-click='selectItem(row)') {{$index + 1}}) {{row.valueType}}
label.placeholder(ng-show='(displayedRows | domainsValidation:ui.showValid:true).length == 0') No domain models found
[3/5] ignite git commit: Merge remote-tracking branch
'origin/ignite-843-rc2' into ignite-843-rc2
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1c728606
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1c728606
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1c728606
Branch: refs/heads/ignite-2612
Commit: 1c7286063a1b8d83a9f9c6f6cbce836ad03bf7d8
Parents: 5e3b919 1b214b0
Author: Andrey <an...@gridgain.com>
Authored: Wed Feb 24 16:38:45 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Feb 24 16:38:45 2016 +0700
----------------------------------------------------------------------
.../app/directives/bs-affix-update/bs-affix-update.directive.js | 4 ++--
.../src/main/js/views/configuration/domains.jade | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[2/5] ignite git commit: IGNITE-2711 Stop refresh on paragraph remove.
Posted by ak...@apache.org.
IGNITE-2711 Stop refresh on paragraph remove.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5e3b9191
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5e3b9191
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5e3b9191
Branch: refs/heads/ignite-2612
Commit: 5e3b91912eda5dcb9f5a3afb2811f61cfad152a9
Parents: daccaef
Author: Andrey <an...@gridgain.com>
Authored: Wed Feb 24 16:38:25 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Feb 24 16:38:25 2016 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/sql-controller.js | 26 +++++++++++---------
1 file changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5e3b9191/modules/control-center-web/src/main/js/controllers/sql-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js
index a7abc82..84773b2 100644
--- a/modules/control-center-web/src/main/js/controllers/sql-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js
@@ -407,23 +407,25 @@ consoleModule.controller('sqlController', function ($http, $timeout, $interval,
$scope.removeParagraph = function(paragraph) {
$confirm.confirm('Are you sure you want to remove: "' + paragraph.name + '"?')
.then(function () {
- var paragraph_idx = _.findIndex($scope.notebook.paragraphs, function (item) {
- return paragraph == item;
- });
+ $scope.stopRefresh(paragraph);
- var panel_idx = _.findIndex($scope.expandedParagraphs, function (item) {
- return paragraph_idx == item;
- });
+ var paragraph_idx = _.findIndex($scope.notebook.paragraphs, function (item) {
+ return paragraph == item;
+ });
+
+ var panel_idx = _.findIndex($scope.expandedParagraphs, function (item) {
+ return paragraph_idx == item;
+ });
- if (panel_idx >= 0)
- $scope.expandedParagraphs.splice(panel_idx, 1);
+ if (panel_idx >= 0)
+ $scope.expandedParagraphs.splice(panel_idx, 1);
- $scope.notebook.paragraphs.splice(paragraph_idx, 1);
+ $scope.notebook.paragraphs.splice(paragraph_idx, 1);
- $scope.rebuildScrollParagraphs();
+ $scope.rebuildScrollParagraphs();
- QueryNotebooks.save($scope.demo, $scope.notebook)
- .catch(_handleException);
+ QueryNotebooks.save($scope.demo, $scope.notebook)
+ .catch(_handleException);
});
};
[4/5] ignite git commit: IGNITE-2424 Discern columns with the same
name.
Posted by ak...@apache.org.
IGNITE-2424 Discern columns with the same name.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d558cc4f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d558cc4f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d558cc4f
Branch: refs/heads/ignite-2612
Commit: d558cc4f39c4c9e028a5f13acf0ea8a0de29ff51
Parents: 1c72860
Author: Vasiliy Sisko <vs...@gridgain.com>
Authored: Wed Feb 24 18:11:32 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Feb 24 18:11:32 2016 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/sql-controller.js | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d558cc4f/modules/control-center-web/src/main/js/controllers/sql-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js
index 84773b2..55748cc 100644
--- a/modules/control-center-web/src/main/js/controllers/sql-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js
@@ -486,6 +486,18 @@ consoleModule.controller('sqlController', function ($http, $timeout, $interval,
var _rebuildColumns = function (paragraph) {
var columnDefs = [];
+ _.forEach(_.groupBy(paragraph.meta, 'fieldName'), function (colsByName, fieldName) {
+ var colsByTypes = _.groupBy(colsByName, 'typeName');
+
+ var needType = _.keys(colsByTypes).length > 1;
+
+ _.forEach(colsByTypes, function(colsByType, typeName) {
+ _.forEach(colsByType, function (col, ix) {
+ col.fieldName = (needType && !$common.isEmptyString(typeName) ? typeName + '.' : '') + fieldName + (ix > 0 ? ix : '');
+ })
+ });
+ });
+
_.forEach(paragraph.meta, function (col, idx) {
if (paragraph.columnFilter(col)) {
if (_notObjectType(col.fieldTypeName))
[5/5] ignite git commit: Merge branch 'ignite-843-rc2' of
https://git-wip-us.apache.org/repos/asf/ignite into ignite-2612
Posted by ak...@apache.org.
Merge branch 'ignite-843-rc2' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-2612
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9700b7c0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9700b7c0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9700b7c0
Branch: refs/heads/ignite-2612
Commit: 9700b7c0d61f64462b1b0cc816164634117682c9
Parents: ade3c4a d558cc4
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Feb 24 20:20:16 2016 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Feb 24 20:20:16 2016 +0700
----------------------------------------------------------------------
.../bs-affix-update.directive.js | 4 +--
.../src/main/js/controllers/sql-controller.js | 38 +++++++++++++-------
.../main/js/views/configuration/domains.jade | 2 +-
3 files changed, 29 insertions(+), 15 deletions(-)
----------------------------------------------------------------------