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 2015/07/31 08:00:12 UTC
[1/2] incubator-ignite git commit: # ignite-1146 Summary,
Java tab: 'snippet' value has no check mark in dropdown list.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 25d26a819 -> ca1e9b31a
# ignite-1146 Summary, Java tab: 'snippet' value has no check mark in dropdown list.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cddb1d20
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cddb1d20
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cddb1d20
Branch: refs/heads/ignite-843
Commit: cddb1d20d19254416f0efbc8d09fdd31ee3f5ab0
Parents: a3c533c
Author: Andrey <an...@gridgain.com>
Authored: Fri Jul 31 13:01:20 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Jul 31 13:01:20 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/summary-controller.js | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cddb1d20/modules/control-center-web/src/main/js/controllers/summary-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/summary-controller.js b/modules/control-center-web/src/main/js/controllers/summary-controller.js
index a152485..4edc484 100644
--- a/modules/control-center-web/src/main/js/controllers/summary-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/summary-controller.js
@@ -20,8 +20,8 @@ controlCenterModule.controller('summaryController', ['$scope', '$http', '$common
$scope.getModel = $common.getModel;
$scope.javaClassItems = [
- {label: 'snippet', value: false},
- {label: 'factory class', value: true}
+ {label: 'snippet', value: 1},
+ {label: 'factory class', value: 2}
];
$scope.evictionPolicies = [
@@ -34,8 +34,8 @@ controlCenterModule.controller('summaryController', ['$scope', '$http', '$common
$scope.oss = ['debian:8', 'ubuntu:14.10'];
- $scope.configServer = {javaClassServer: false, os: undefined};
- $scope.backupItem = {javaClassClient: false};
+ $scope.configServer = {javaClassServer: 1, os: undefined};
+ $scope.backupItem = {javaClassClient: 1};
$http.get('/models/summary.json')
.success(function (data) {
@@ -62,7 +62,8 @@ controlCenterModule.controller('summaryController', ['$scope', '$http', '$common
};
$scope.reloadServer = function () {
- $scope.javaServer = $scope.configServer.javaClassServer ? $scope.configServer.javaClass : $scope.configServer.javaSnippet;
+ $scope.javaServer = $scope.configServer.javaClassServer === 2 ?
+ $scope.configServer.javaClass : $scope.configServer.javaSnippet;
if ($scope.configServer.docker) {
var os = $scope.configServer.os ? $scope.configServer.os : $scope.oss[0];
@@ -108,7 +109,7 @@ controlCenterModule.controller('summaryController', ['$scope', '$http', '$common
$scope.generateClient = function () {
$http.post('summary/generator', {
- _id: $scope.selectedItem._id, javaClass: $scope.backupItem.javaClassClient,
+ _id: $scope.selectedItem._id, javaClass: $scope.backupItem.javaClassClient === 2,
clientNearConfiguration: $scope.backupItem.nearConfiguration
})
.success(function (data) {
[2/2] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-843' into ignite-843
Posted by an...@apache.org.
Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ca1e9b31
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ca1e9b31
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ca1e9b31
Branch: refs/heads/ignite-843
Commit: ca1e9b31aec611aa54b9721f6aa999b718c018dd
Parents: cddb1d2 25d26a8
Author: Andrey <an...@gridgain.com>
Authored: Fri Jul 31 13:01:38 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Jul 31 13:01:38 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/models/caches.json | 6 +----
.../src/main/js/routes/generator/java.js | 28 +++++++++++---------
.../src/main/js/routes/generator/xml.js | 23 +++++++++-------
.../src/main/js/views/includes/controls.jade | 5 ++--
4 files changed, 33 insertions(+), 29 deletions(-)
----------------------------------------------------------------------