Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1554B18C40 for ; Thu, 11 Feb 2016 12:31:53 +0000 (UTC) Received: (qmail 31725 invoked by uid 500); 11 Feb 2016 12:31:53 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 31664 invoked by uid 500); 11 Feb 2016 12:31:53 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 31528 invoked by uid 99); 11 Feb 2016 12:31:52 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Feb 2016 12:31:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C5553E38B2; Thu, 11 Feb 2016 12:31:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.apache.org Date: Thu, 11 Feb 2016 12:31:55 -0000 Message-Id: <1d143c4c7c9347ee93cdee0fae06d3d1@git.apache.org> In-Reply-To: <2522c326196747269488f6a42fe22ae0@git.apache.org> References: <2522c326196747269488f6a42fe22ae0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/7] ignite git commit: IGNITE-843 Fixed bugs. 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 Authored: Thu Feb 11 14:38:52 2016 +0700 Committer: Andrey 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')