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/11 13:31:52 UTC
[1/7] ignite git commit: IGNITE-1939 Fixed $selectAll, $selectNone.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc3 aca04bc3b -> 84207e6a2
IGNITE-1939 Fixed $selectAll, $selectNone.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4278569c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4278569c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4278569c
Branch: refs/heads/ignite-843-rc3
Commit: 4278569c1808db44840508cb4b9b7efd938be1e7
Parents: aca04bc
Author: Andrey <an...@gridgain.com>
Authored: Thu Feb 11 11:23:47 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Feb 11 11:23:47 2016 +0700
----------------------------------------------------------------------
.../src/main/js/app/decorator/select.js | 67 ++++++++++++++++++++
.../control-center-web/src/main/js/app/index.js | 2 +
.../control-center-web/src/main/js/config.js | 53 ++++++++--------
.../control-center-web/src/main/js/package.json | 18 +++---
.../src/main/js/serve/routes/admin.js | 4 +-
.../src/main/js/views/templates/select.jade | 4 +-
6 files changed, 107 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4278569c/modules/control-center-web/src/main/js/app/decorator/select.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/decorator/select.js b/modules/control-center-web/src/main/js/app/decorator/select.js
new file mode 100644
index 0000000..f770fc1
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/decorator/select.js
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import angular from 'angular';
+
+angular.module('mgcrea.ngStrap.select')
+ .decorator('$select', ($delegate) => {
+ function SelectFactoryDecorated(element, controller, config) {
+ const deligate = $delegate(element, controller, config);
+
+ const scope = deligate.$scope;
+
+ const $selectAllDeligate = scope.$selectAll;
+
+ scope.$selectAll = () => {
+ if (scope.$isMultiple) {
+ const newActiveIndex = [];
+
+ for (let i = 0; i < scope.$matches.length; i++)
+ newActiveIndex.push(i);
+
+ scope.$activeIndex = newActiveIndex;
+
+ controller.$setViewValue(scope.$activeIndex.map((index) => {
+ if (angular.isUndefined(scope.$matches[index]))
+ return null;
+
+ return scope.$matches[index].value;
+ }));
+ }
+ else
+ $selectAllDeligate();
+ };
+
+ const $selectNoneDeligate = scope.$selectNone;
+
+ scope.$selectNone = () => {
+ if (scope.$isMultiple) {
+ scope.$activeIndex = [];
+
+ controller.$setViewValue([]);
+ }
+ else
+ $selectNoneDeligate();
+ };
+
+ return deligate;
+ }
+
+ SelectFactoryDecorated.defaults = $delegate.defaults;
+
+ return SelectFactoryDecorated;
+ });
http://git-wip-us.apache.org/repos/asf/ignite/blob/4278569c/modules/control-center-web/src/main/js/app/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/index.js b/modules/control-center-web/src/main/js/app/index.js
index 30dc3ba..7862054 100644
--- a/modules/control-center-web/src/main/js/app/index.js
+++ b/modules/control-center-web/src/main/js/app/index.js
@@ -56,6 +56,8 @@ import 'angular-ui-grid/ui-grid.css!';
import 'angular-loading/angular-loading.css!';
import 'angular-motion/dist/angular-motion.css!';
+import './decorator/select';
+
import './modules/form/form.module';
import './modules/JavaTypes/JavaTypes.provider';
import './modules/QueryNotebooks/QueryNotebooks.provider';
http://git-wip-us.apache.org/repos/asf/ignite/blob/4278569c/modules/control-center-web/src/main/js/config.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/config.js b/modules/control-center-web/src/main/js/config.js
index 136d52e..4868aef 100644
--- a/modules/control-center-web/src/main/js/config.js
+++ b/modules/control-center-web/src/main/js/config.js
@@ -17,22 +17,22 @@ System.config({
"Blob": "github:eligrey/Blob.js@master",
"FileSaver": "github:eligrey/FileSaver.js@master",
"ace": "github:ajaxorg/ace-builds@1.2.3",
- "angular": "github:angular/bower-angular@1.4.9",
+ "angular": "github:angular/bower-angular@1.5.0",
"angular-ag-grid": "github:ceolter/ag-grid@2.3.5",
- "angular-animate": "github:angular/bower-angular-animate@1.4.9",
- "angular-drag-and-drop-lists": "github:marceljuenemann/angular-drag-and-drop-lists@1.3.0",
+ "angular-animate": "github:angular/bower-angular-animate@1.5.0",
+ "angular-drag-and-drop-lists": "github:marceljuenemann/angular-drag-and-drop-lists@1.4.0",
"angular-grid": "github:ceolter/ag-grid@2.3.5",
"angular-loading": "github:darthwade/angular-loading@0.1.4",
"angular-motion": "github:mgcrea/angular-motion@0.4.3",
"angular-nvd3": "github:krispo/angular-nvd3@1.0.5",
- "angular-retina": "github:jrief/angular-retina@0.3.8",
- "angular-sanitize": "github:angular/bower-angular-sanitize@1.4.9",
+ "angular-retina": "github:jrief/angular-retina@0.3.9",
+ "angular-sanitize": "github:angular/bower-angular-sanitize@1.5.0",
"angular-smart-table": "github:lorenzofox3/Smart-Table@2.1.7",
- "angular-strap": "github:akuznetsov-gridgain/angular-strap@fix-1852-2.3.6",
+ "angular-strap": "github:mgcrea/angular-strap@2.3.7",
"angular-tree-control": "github:wix/angular-tree-control@0.2.23",
"angular-ui-ace": "github:angular-ui/ui-ace@0.2.3",
- "angular-ui-grid": "github:angular-ui/bower-ui-grid@3.1.0",
- "angular-ui-router": "github:angular-ui/ui-router@0.2.17",
+ "angular-ui-grid": "github:angular-ui/bower-ui-grid@3.1.1",
+ "angular-ui-router": "github:angular-ui/ui-router@0.2.18",
"angular-ui-router-title": "github:nonplus/angular-ui-router-title@0.0.4",
"babel": "npm:babel-core@5.8.35",
"babel-runtime": "npm:babel-runtime@5.8.35",
@@ -53,28 +53,22 @@ System.config({
"pdfmake": "github:bpampuch/pdfmake@0.1.20",
"query-command-supported": "github:zenorocha/document.queryCommandSupported@1.0.0",
"spinjs": "github:fgnass/spin.js@2.3.2",
- "github:akuznetsov-gridgain/angular-strap@fix-1852-2.3.6": {
- "angular": "github:angular/bower-angular@1.4.9",
- "angular-animate": "github:angular/bower-angular-animate@1.4.9",
- "angular-motion": "github:mgcrea/angular-motion@0.4.3",
- "angular-sanitize": "github:angular/bower-angular-sanitize@1.4.9"
- },
- "github:angular-ui/bower-ui-grid@3.1.0": {
+ "github:angular-ui/bower-ui-grid@3.1.1": {
"pdfmake": "github:bpampuch/pdfmake@0.1.20"
},
"github:angular-ui/ui-ace@0.2.3": {
"ace": "github:ajaxorg/ace-builds@1.2.3"
},
- "github:angular-ui/ui-router@0.2.17": {
- "angular": "github:angular/bower-angular@1.4.9"
+ "github:angular-ui/ui-router@0.2.18": {
+ "angular": "github:angular/bower-angular@1.5.0"
},
- "github:angular/bower-angular-animate@1.4.9": {
- "angular": "github:angular/bower-angular@1.4.9"
+ "github:angular/bower-angular-animate@1.5.0": {
+ "angular": "github:angular/bower-angular@1.5.0"
},
- "github:angular/bower-angular-sanitize@1.4.9": {
- "angular": "github:angular/bower-angular@1.4.9"
+ "github:angular/bower-angular-sanitize@1.5.0": {
+ "angular": "github:angular/bower-angular@1.5.0"
},
- "github:angular/bower-angular@1.4.9": {
+ "github:angular/bower-angular@1.5.0": {
"jquery": "github:components/jquery@2.2.0"
},
"github:darthwade/angular-loading@0.1.4": {
@@ -131,22 +125,25 @@ System.config({
"vm-browserify": "npm:vm-browserify@0.0.4"
},
"github:krispo/angular-nvd3@1.0.5": {
- "angular": "github:angular/bower-angular@1.4.9",
+ "angular": "github:angular/bower-angular@1.5.0",
"d3": "npm:d3@3.5.14",
"nvd3": "npm:nvd3@1.8.1"
},
- "github:marceljuenemann/angular-drag-and-drop-lists@1.3.0": {
- "angular": "github:angular/bower-angular@1.4.9"
- },
"github:mgcrea/angular-motion@0.4.3": {
- "angular": "github:angular/bower-angular@1.4.9",
+ "angular": "github:angular/bower-angular@1.5.0",
"css": "github:systemjs/plugin-css@0.1.20"
},
+ "github:mgcrea/angular-strap@2.3.7": {
+ "angular": "github:angular/bower-angular@1.5.0",
+ "angular-animate": "github:angular/bower-angular-animate@1.5.0",
+ "angular-motion": "github:mgcrea/angular-motion@0.4.3",
+ "angular-sanitize": "github:angular/bower-angular-sanitize@1.5.0"
+ },
"github:twbs/bootstrap@3.3.6": {
"jquery": "github:components/jquery@2.2.0"
},
"github:wix/angular-tree-control@0.2.23": {
- "angular": "github:angular/bower-angular@1.4.9"
+ "angular": "github:angular/bower-angular@1.5.0"
},
"npm:acorn-globals@1.0.9": {
"acorn": "npm:acorn@2.7.0"
http://git-wip-us.apache.org/repos/asf/ignite/blob/4278569c/modules/control-center-web/src/main/js/package.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/package.json b/modules/control-center-web/src/main/js/package.json
index e526d86..3c36eeb 100644
--- a/modules/control-center-web/src/main/js/package.json
+++ b/modules/control-center-web/src/main/js/package.json
@@ -70,16 +70,16 @@
"jspm": {
"dependencies": {
"ace": "github:ajaxorg/ace-builds@^1.2.2",
- "angular": "github:angular/bower-angular@^1.4.8",
- "angular-animate": "github:angular/bower-angular-animate@^1.4.8",
+ "angular": "github:angular/bower-angular@^1.5.0",
+ "angular-animate": "github:angular/bower-angular-animate@^1.5.0",
"angular-drag-and-drop-lists": "github:marceljuenemann/angular-drag-and-drop-lists@^1.3.0",
"angular-loading": "github:darthwade/angular-loading@^0.1.4",
"angular-motion": "github:mgcrea/angular-motion@^0.4.3",
"angular-nvd3": "github:krispo/angular-nvd3@^1.0.4",
"angular-retina": "github:jrief/angular-retina@^0.3.8",
- "angular-sanitize": "github:angular/bower-angular-sanitize@^1.4.8",
+ "angular-sanitize": "github:angular/bower-angular-sanitize@^1.5.0",
"angular-smart-table": "github:lorenzofox3/Smart-Table@^2.1.4",
- "angular-strap": "github:akuznetsov-gridgain/angular-strap@fix-1852-2.3.6",
+ "angular-strap": "github:mgcrea/angular-strap@^2.3.7",
"angular-tree-control": "github:wix/angular-tree-control@^0.2.23",
"angular-ui-ace": "github:angular-ui/ui-ace@^0.2.3",
"angular-ui-grid": "github:angular-ui/bower-ui-grid@^3.0.7",
@@ -105,7 +105,7 @@
"core-js": "npm:core-js@^1.1.4"
},
"overrides": {
- "github:angular/bower-angular@1.4.8": {
+ "github:angular/bower-angular@1.5.0": {
"format": "global",
"dependencies": {
"jquery": "github:components/jquery@^2.1.4"
@@ -217,13 +217,13 @@
"pdfmake": "github:bpampuch/pdfmake@^0.1.20"
}
},
- "github:akuznetsov-gridgain/angular-strap@fix-1852-2.3.6": {
+ "github:mgcrea/angular-strap@2.3.7": {
"main": "dist/angular-strap.tpl",
"dependencies": {
- "angular": "github:angular/bower-angular@^1.4.8",
- "angular-animate": "github:angular/bower-angular-animate@^1.4.8",
+ "angular": "github:angular/bower-angular@^1.5.0",
+ "angular-animate": "github:angular/bower-angular-animate@^1.5.0",
"angular-motion": "github:mgcrea/angular-motion@^0.4.3",
- "angular-sanitize": "github:angular/bower-angular-sanitize@^1.4.8"
+ "angular-sanitize": "github:angular/bower-angular-sanitize@^1.5.0"
},
"shim": {
"dist/angular-strap.tpl": {
http://git-wip-us.apache.org/repos/asf/ignite/blob/4278569c/modules/control-center-web/src/main/js/serve/routes/admin.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/admin.js b/modules/control-center-web/src/main/js/serve/routes/admin.js
index a79d584..013ae5f 100644
--- a/modules/control-center-web/src/main/js/serve/routes/admin.js
+++ b/modules/control-center-web/src/main/js/serve/routes/admin.js
@@ -19,10 +19,10 @@
module.exports = {
implements: 'admin-routes',
- inject: ['require(lodash)', 'require(express)', 'require(nodemailer)', 'mongo']
+ inject: ['require(lodash)', 'require(express)', 'require(nodemailer)', 'settings', 'mongo']
};
-module.exports.factory = function (_, express, nodemailer, mongo) {
+module.exports.factory = function (_, express, nodemailer, settings, mongo) {
return new Promise((resolve) => {
const router = express.Router();
http://git-wip-us.apache.org/repos/asf/ignite/blob/4278569c/modules/control-center-web/src/main/js/views/templates/select.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/templates/select.jade b/modules/control-center-web/src/main/js/views/templates/select.jade
index 5825d1e..3feee61 100644
--- a/modules/control-center-web/src/main/js/views/templates/select.jade
+++ b/modules/control-center-web/src/main/js/views/templates/select.jade
@@ -16,8 +16,8 @@
ul.select.dropdown-menu(tabindex='-1' ng-show='$isVisible()' role='select')
li(ng-if='$showAllNoneButtons || ($isMultiple && $matches.length > 2)')
- a(id='li-dropdown-select-all' ng-click='$selectAllAtOnce()') {{$allText}} ({{$matches.length}})
- a(id='li-dropdown-select-none' ng-click='$selectNoneAtOnce()') {{$noneText}}
+ a(id='li-dropdown-select-all' ng-click='$selectAll()') {{$allText}} ({{$matches.length}})
+ a(id='li-dropdown-select-none' ng-click='$selectNone()') {{$noneText}}
hr(style='margin: 5px 0')
li(role='presentation' ng-repeat='match in $matches')
hr(ng-if='match.value == undefined' style='margin: 5px 0')
[4/7] ignite git commit: IGNITE-843 Fixed bugs.
Posted by ak...@apache.org.
IGNITE-843 Fixed bugs.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ac5ef7f1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ac5ef7f1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ac5ef7f1
Branch: refs/heads/ignite-843-rc3
Commit: ac5ef7f1267b72090a4e43944ccf451f6b37fbcb
Parents: 28bc296
Author: Andrey <an...@gridgain.com>
Authored: Thu Feb 11 14:38:52 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Feb 11 14:38:52 2016 +0700
----------------------------------------------------------------------
modules/control-center-web/src/main/js/app/index.js | 2 +-
modules/control-center-web/src/main/js/config.js | 14 +++++++-------
.../src/main/js/helpers/generator/generator-docker.js | 2 +-
modules/control-center-web/src/main/js/package.json | 4 ++--
.../src/main/js/views/configuration/clusters.jade | 2 +-
.../src/main/js/views/templates/select.jade | 4 ++--
6 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac5ef7f1/modules/control-center-web/src/main/js/app/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/index.js b/modules/control-center-web/src/main/js/app/index.js
index 7862054..07ff05c 100644
--- a/modules/control-center-web/src/main/js/app/index.js
+++ b/modules/control-center-web/src/main/js/app/index.js
@@ -56,7 +56,7 @@ import 'angular-ui-grid/ui-grid.css!';
import 'angular-loading/angular-loading.css!';
import 'angular-motion/dist/angular-motion.css!';
-import './decorator/select';
+//import './decorator/select';
import './modules/form/form.module';
import './modules/JavaTypes/JavaTypes.provider';
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac5ef7f1/modules/control-center-web/src/main/js/config.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/config.js b/modules/control-center-web/src/main/js/config.js
index 4868aef..d5be50e 100644
--- a/modules/control-center-web/src/main/js/config.js
+++ b/modules/control-center-web/src/main/js/config.js
@@ -28,7 +28,7 @@ System.config({
"angular-retina": "github:jrief/angular-retina@0.3.9",
"angular-sanitize": "github:angular/bower-angular-sanitize@1.5.0",
"angular-smart-table": "github:lorenzofox3/Smart-Table@2.1.7",
- "angular-strap": "github:mgcrea/angular-strap@2.3.7",
+ "angular-strap": "github:akuznetsov-gridgain/angular-strap@fix-1852-2.3.6",
"angular-tree-control": "github:wix/angular-tree-control@0.2.23",
"angular-ui-ace": "github:angular-ui/ui-ace@0.2.3",
"angular-ui-grid": "github:angular-ui/bower-ui-grid@3.1.1",
@@ -53,6 +53,12 @@ System.config({
"pdfmake": "github:bpampuch/pdfmake@0.1.20",
"query-command-supported": "github:zenorocha/document.queryCommandSupported@1.0.0",
"spinjs": "github:fgnass/spin.js@2.3.2",
+ "github:akuznetsov-gridgain/angular-strap@fix-1852-2.3.6": {
+ "angular": "github:angular/bower-angular@1.5.0",
+ "angular-animate": "github:angular/bower-angular-animate@1.5.0",
+ "angular-motion": "github:mgcrea/angular-motion@0.4.3",
+ "angular-sanitize": "github:angular/bower-angular-sanitize@1.5.0"
+ },
"github:angular-ui/bower-ui-grid@3.1.1": {
"pdfmake": "github:bpampuch/pdfmake@0.1.20"
},
@@ -133,12 +139,6 @@ System.config({
"angular": "github:angular/bower-angular@1.5.0",
"css": "github:systemjs/plugin-css@0.1.20"
},
- "github:mgcrea/angular-strap@2.3.7": {
- "angular": "github:angular/bower-angular@1.5.0",
- "angular-animate": "github:angular/bower-angular-animate@1.5.0",
- "angular-motion": "github:mgcrea/angular-motion@0.4.3",
- "angular-sanitize": "github:angular/bower-angular-sanitize@1.5.0"
- },
"github:twbs/bootstrap@3.3.6": {
"jquery": "github:components/jquery@2.2.0"
},
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac5ef7f1/modules/control-center-web/src/main/js/helpers/generator/generator-docker.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-docker.js b/modules/control-center-web/src/main/js/helpers/generator/generator-docker.js
index c45b25b..6ef6ec7 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-docker.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-docker.js
@@ -41,7 +41,7 @@ $generatorDocker.clusterDocker = function (cluster, version) {
'RUN mvn -f ' + cluster.name + '/pom.xml clean package -DskipTests\n\n' +
'# Copy project jars to node classpath.\n' +
'RUN mkdir $IGNITE_HOME/libs/' + cluster.name + ' && \\\n' +
- '(cd ' + cluster.name +'/target && find . -name "*.jar" -type f | cpio -updm $IGNITE_HOME/libs/' + cluster.name + ') && \\\n' +
+ 'find ' + cluster.name + '/target -name "*.jar" -type f -exec cp {} $IGNITE_HOME/libs/' + cluster.name + ' \; && \\\n' +
'cp -r ' + cluster.name + '/config/* $IGNITE_HOME/config\n'
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac5ef7f1/modules/control-center-web/src/main/js/package.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/package.json b/modules/control-center-web/src/main/js/package.json
index 3c36eeb..7910f35 100644
--- a/modules/control-center-web/src/main/js/package.json
+++ b/modules/control-center-web/src/main/js/package.json
@@ -79,7 +79,7 @@
"angular-retina": "github:jrief/angular-retina@^0.3.8",
"angular-sanitize": "github:angular/bower-angular-sanitize@^1.5.0",
"angular-smart-table": "github:lorenzofox3/Smart-Table@^2.1.4",
- "angular-strap": "github:mgcrea/angular-strap@^2.3.7",
+ "angular-strap": "github:akuznetsov-gridgain/angular-strap@fix-1852-2.3.6",
"angular-tree-control": "github:wix/angular-tree-control@^0.2.23",
"angular-ui-ace": "github:angular-ui/ui-ace@^0.2.3",
"angular-ui-grid": "github:angular-ui/bower-ui-grid@^3.0.7",
@@ -217,7 +217,7 @@
"pdfmake": "github:bpampuch/pdfmake@^0.1.20"
}
},
- "github:mgcrea/angular-strap@2.3.7": {
+ "github:akuznetsov-gridgain/angular-strap@fix-1852-2.3.6": {
"main": "dist/angular-strap.tpl",
"dependencies": {
"angular": "github:angular/bower-angular@^1.5.0",
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac5ef7f1/modules/control-center-web/src/main/js/views/configuration/clusters.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/clusters.jade b/modules/control-center-web/src/main/js/views/configuration/clusters.jade
index d854d4a..3c3db82 100644
--- a/modules/control-center-web/src/main/js/views/configuration/clusters.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/clusters.jade
@@ -50,7 +50,7 @@ include ../includes/infos
hr
.bs-affix-fix
div(bs-collapse='' data-allow-multiple='true' ng-model='ui.activePanels')
- form.form-horizontal(name='ui.inputForm' ng-show='backupItem && (!backupItem._id || _.includes(displayedRows, selectedItem))' novalidate)
+ form.form-horizontal(name='ui.inputForm' ng-show='backupItem && (!backupItem._id || _.find(displayedRows, {_id: backupItem._id}))' novalidate)
.panel-group(ng-click='triggerDigest = true')
ignite-configuration-clusters-general
.advanced-options
http://git-wip-us.apache.org/repos/asf/ignite/blob/ac5ef7f1/modules/control-center-web/src/main/js/views/templates/select.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/templates/select.jade b/modules/control-center-web/src/main/js/views/templates/select.jade
index 3feee61..5825d1e 100644
--- a/modules/control-center-web/src/main/js/views/templates/select.jade
+++ b/modules/control-center-web/src/main/js/views/templates/select.jade
@@ -16,8 +16,8 @@
ul.select.dropdown-menu(tabindex='-1' ng-show='$isVisible()' role='select')
li(ng-if='$showAllNoneButtons || ($isMultiple && $matches.length > 2)')
- a(id='li-dropdown-select-all' ng-click='$selectAll()') {{$allText}} ({{$matches.length}})
- a(id='li-dropdown-select-none' ng-click='$selectNone()') {{$noneText}}
+ a(id='li-dropdown-select-all' ng-click='$selectAllAtOnce()') {{$allText}} ({{$matches.length}})
+ a(id='li-dropdown-select-none' ng-click='$selectNoneAtOnce()') {{$noneText}}
hr(style='margin: 5px 0')
li(role='presentation' ng-repeat='match in $matches')
hr(ng-if='match.value == undefined' style='margin: 5px 0')
[3/7] ignite git commit: IGNITE-843 Check es6 in server side code.
Posted by ak...@apache.org.
IGNITE-843 Check es6 in server side code.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/28bc296d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/28bc296d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/28bc296d
Branch: refs/heads/ignite-843-rc3
Commit: 28bc296da4741d4138107556b50a29daedb2cb0a
Parents: 9da27eb
Author: Andrey <an...@gridgain.com>
Authored: Thu Feb 11 13:41:53 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Feb 11 13:41:53 2016 +0700
----------------------------------------------------------------------
.../src/main/js/gulpfile.js/tasks/eslint.js | 16 ++++++++++++--
.../src/main/js/serve/routes/routes.js | 23 ++++++++------------
2 files changed, 23 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/28bc296d/modules/control-center-web/src/main/js/gulpfile.js/tasks/eslint.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/gulpfile.js/tasks/eslint.js b/modules/control-center-web/src/main/js/gulpfile.js/tasks/eslint.js
index 696144f..fa8dce0 100644
--- a/modules/control-center-web/src/main/js/gulpfile.js/tasks/eslint.js
+++ b/modules/control-center-web/src/main/js/gulpfile.js/tasks/eslint.js
@@ -16,14 +16,26 @@
*/
var gulp = require('gulp');
+var sequence = require('gulp-sequence');
+
var eslint = require('gulp-eslint');
var paths = [
'./app/**/*.js'
];
-gulp.task('eslint', function() {
+gulp.task('eslint:node', function() {
+ return gulp.src('./serve/**/*.js')
+ .pipe(eslint({envs: ['node']}))
+ .pipe(eslint.format());
+});
+
+gulp.task('eslint:browser', function() {
return gulp.src(paths)
- .pipe(eslint())
+ .pipe(eslint({envs: ['browser']}))
.pipe(eslint.format());
});
+
+gulp.task('eslint', function(cb) {
+ return sequence('eslint:browser', 'eslint:node')(cb);
+});
http://git-wip-us.apache.org/repos/asf/ignite/blob/28bc296d/modules/control-center-web/src/main/js/serve/routes/routes.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/routes.js b/modules/control-center-web/src/main/js/serve/routes/routes.js
index 268931f..9c7e7c9 100644
--- a/modules/control-center-web/src/main/js/serve/routes/routes.js
+++ b/modules/control-center-web/src/main/js/serve/routes/routes.js
@@ -35,10 +35,8 @@ module.exports = {
]
};
-module.exports.factory = function (publicRoutes, adminRoutes, profileRoutes,
- clusterRoutes, domainRoutes, cacheRoutes, igfsRoutes,
- notebookRoutes, agentRoutes,
- pluginRoutes) {
+module.exports.factory = function(publicRoutes, adminRoutes, profileRoutes, clusterRoutes, domainRoutes, cacheRoutes,
+ igfsRoutes, notebookRoutes, agentRoutes, pluginRoutes) {
return {
register: (app) => {
app.all('*', (req, res, next) => {
@@ -55,13 +53,9 @@ module.exports.factory = function (publicRoutes, adminRoutes, profileRoutes,
next();
});
- const _mustAuthenticated = (req, res, next) => {
- req.isAuthenticated() ? next() : res.redirect('/');
- };
+ const _mustAuthenticated = (req, res, next) => req.isAuthenticated() ? next() : res.redirect('/');
- const _adminOnly = (req, res, next) => {
- req.isAuthenticated() && req.user.admin ? next() : res.sendStatus(403);
- };
+ const _adminOnly = (req, res, next) => req.isAuthenticated() && req.user.admin ? next() : res.sendStatus(403);
// Registering the standard routes
app.use('/', publicRoutes);
@@ -79,13 +73,14 @@ module.exports.factory = function (publicRoutes, adminRoutes, profileRoutes,
app.use('/agent', _mustAuthenticated, agentRoutes);
// Registering the routes of all plugin modules
- for (var name in pluginRoutes)
+ for (const name in pluginRoutes) {
if (pluginRoutes.hasOwnProperty(name))
pluginRoutes[name].register(app, _mustAuthenticated, _adminOnly);
+ }
// Catch 404 and forward to error handler.
- app.use(function (req, res, next) {
- var err = new Error('Not Found: ' + req.originalUrl);
+ app.use((req, res, next) => {
+ const err = new Error('Not Found: ' + req.originalUrl);
err.status = 404;
@@ -93,7 +88,7 @@ module.exports.factory = function (publicRoutes, adminRoutes, profileRoutes,
});
// Production error handler: no stacktraces leaked to user.
- app.use(function (err, req, res) {
+ app.use((err, req, res) => {
res.status(err.status || 500);
res.render('error', {
[5/7] ignite git commit: IGNITE-843 Minor fix.
Posted by ak...@apache.org.
IGNITE-843 Minor fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d5a6e9ac
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d5a6e9ac
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d5a6e9ac
Branch: refs/heads/ignite-843-rc3
Commit: d5a6e9acf77e6c42b0da13d56823258ca2adef6f
Parents: ac5ef7f
Author: Andrey <an...@gridgain.com>
Authored: Thu Feb 11 14:48:21 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Feb 11 14:48:21 2016 +0700
----------------------------------------------------------------------
.../src/main/js/helpers/generator/generator-docker.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d5a6e9ac/modules/control-center-web/src/main/js/helpers/generator/generator-docker.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-docker.js b/modules/control-center-web/src/main/js/helpers/generator/generator-docker.js
index 6ef6ec7..dda58a7 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-docker.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-docker.js
@@ -31,10 +31,10 @@ $generatorDocker.clusterDocker = function (cluster, version) {
'ENV CONFIG_URI config/' + cluster.name + '-server.xml\n\n' +
'# Copy ignite-http-rest from optional.\n' +
'ENV OPTION_LIBS ignite-rest-http\n\n' +
- '# Update packages and install maven, cpio.\n' +
+ '# Update packages and install maven.\n' +
'RUN \\\n' +
' apt-get update && \\\n' +
- ' apt-get install -y maven cpio\n\n' +
+ ' apt-get install -y maven\n\n' +
'# Append project to container.\n' +
'ADD . ' + cluster.name + '\n\n' +
'# Build project in container container.\n' +
[7/7] ignite git commit: IGNITE-843 Fixed agent launch to show
correct name in JPS.
Posted by ak...@apache.org.
IGNITE-843 Fixed agent launch to show correct name in JPS.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/84207e6a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/84207e6a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/84207e6a
Branch: refs/heads/ignite-843-rc3
Commit: 84207e6a2f406d820b1f063ca2a8aaf9ef1f7859
Parents: 2b0c48f
Author: Vasiliy Sisko <vs...@gridgain.com>
Authored: Thu Feb 11 18:15:49 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Feb 11 18:15:49 2016 +0700
----------------------------------------------------------------------
modules/control-center-agent/bin/ignite-web-agent.bat | 2 +-
modules/control-center-agent/bin/ignite-web-agent.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/84207e6a/modules/control-center-agent/bin/ignite-web-agent.bat
----------------------------------------------------------------------
diff --git a/modules/control-center-agent/bin/ignite-web-agent.bat b/modules/control-center-agent/bin/ignite-web-agent.bat
index f2bc61b..5b3f24c 100644
--- a/modules/control-center-agent/bin/ignite-web-agent.bat
+++ b/modules/control-center-agent/bin/ignite-web-agent.bat
@@ -55,7 +55,7 @@ goto error_finish
::
if "%JVM_OPTS%" == "" set JVM_OPTS=-Xms1g -Xmx1g -server -XX:+AggressiveOpts -XX:MaxPermSize=256m
-"%JAVA_HOME%\bin\java.exe" %JVM_OPTS% -jar ignite-web-agent-${version}.jar %*
+"%JAVA_HOME%\bin\java.exe" %JVM_OPTS% -cp ignite-web-agent-${version}.jar org.apache.ignite.console.agent.AgentLauncher %*
set JAVA_ERRORLEVEL=%ERRORLEVEL%
http://git-wip-us.apache.org/repos/asf/ignite/blob/84207e6a/modules/control-center-agent/bin/ignite-web-agent.sh
----------------------------------------------------------------------
diff --git a/modules/control-center-agent/bin/ignite-web-agent.sh b/modules/control-center-agent/bin/ignite-web-agent.sh
index f8346b4..6d0a1b5 100644
--- a/modules/control-center-agent/bin/ignite-web-agent.sh
+++ b/modules/control-center-agent/bin/ignite-web-agent.sh
@@ -84,4 +84,4 @@ if [ -z "$JVM_OPTS" ] ; then
JVM_OPTS="-Xms1g -Xmx1g -server -XX:+AggressiveOpts -XX:MaxPermSize=256m"
fi
-"$JAVA" ${JVM_OPTS} -jar ignite-web-agent-${version}.jar "$@"
+"$JAVA" ${JVM_OPTS} -cp ignite-web-agent-${version}.jar org.apache.ignite.console.agent.AgentLauncher "$@"
[2/7] ignite git commit: IGNITE-843 Fixed pom.
Posted by ak...@apache.org.
IGNITE-843 Fixed pom.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9da27eb3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9da27eb3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9da27eb3
Branch: refs/heads/ignite-843-rc3
Commit: 9da27eb3517a5b51e30cd11d440c6ea61c2e5986
Parents: 4278569
Author: Andrey <an...@gridgain.com>
Authored: Thu Feb 11 11:40:27 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Feb 11 11:40:27 2016 +0700
----------------------------------------------------------------------
.../src/main/js/helpers/generator/generator-pom.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9da27eb3/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js b/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js
index 7995d0a..4d9724f 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js
@@ -219,7 +219,7 @@ $generatorPom.pom = function (cluster, igniteVersion, mvnRepositories, res) {
res.startBlock('<configuration>');
$generatorPom.addProperty(res, 'excludeGroupIds', excludeGroupIds.join(','));
$generatorPom.addProperty(res, 'outputDirectory', 'target/libs');
- $generatorPom.addProperty(res, 'includeScope', 'runtime');
+ $generatorPom.addProperty(res, 'includeScope', 'compile');
$generatorPom.addProperty(res, 'excludeTransitive', 'true');
res.endBlock('</configuration>');
res.endBlock('</execution>');
[6/7] ignite git commit: IGNITE-843 Minor fix.
Posted by ak...@apache.org.
IGNITE-843 Minor fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2b0c48f7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2b0c48f7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2b0c48f7
Branch: refs/heads/ignite-843-rc3
Commit: 2b0c48f77d439c5cb2ff36abb7387f4267373e49
Parents: d5a6e9a
Author: Andrey <an...@gridgain.com>
Authored: Thu Feb 11 15:16:33 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Feb 11 15:16:33 2016 +0700
----------------------------------------------------------------------
.../src/main/js/helpers/generator/generator-docker.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2b0c48f7/modules/control-center-web/src/main/js/helpers/generator/generator-docker.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-docker.js b/modules/control-center-web/src/main/js/helpers/generator/generator-docker.js
index dda58a7..ab4ca55 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-docker.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-docker.js
@@ -41,7 +41,7 @@ $generatorDocker.clusterDocker = function (cluster, version) {
'RUN mvn -f ' + cluster.name + '/pom.xml clean package -DskipTests\n\n' +
'# Copy project jars to node classpath.\n' +
'RUN mkdir $IGNITE_HOME/libs/' + cluster.name + ' && \\\n' +
- 'find ' + cluster.name + '/target -name "*.jar" -type f -exec cp {} $IGNITE_HOME/libs/' + cluster.name + ' \; && \\\n' +
+ 'find ' + cluster.name + '/target -name "*.jar" -type f -exec cp {} $IGNITE_HOME/libs/' + cluster.name + ' \\; && \\\n' +
'cp -r ' + cluster.name + '/config/* $IGNITE_HOME/config\n'
};