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/06/05 09:45:05 UTC
[1/5] incubator-ignite git commit: # ignite-843 WIP clusters.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 f2dc46e34 -> 04508dc03
# ignite-843 WIP clusters.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2f590110
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2f590110
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2f590110
Branch: refs/heads/ignite-843
Commit: 2f5901109027b8f67e611c280d736f00da55e559
Parents: 712396e
Author: Andrey <an...@gridgain.com>
Authored: Fri Jun 5 13:52:55 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Jun 5 13:52:55 2015 +0700
----------------------------------------------------------------------
modules/webconfig/nodejs/public/javascripts/controllers/caches.js | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f590110/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/public/javascripts/controllers/caches.js b/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
index d902e9a..8a95af5 100644
--- a/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
+++ b/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
@@ -89,7 +89,6 @@ configuratorModule.controller('cachesController', ['$scope', '$http', function($
item.name = 'Cache ' + ($scope.caches.length + 1);
item.space = $scope.spaces[0]._id;
-
$http.post('/rest/caches/save', item)
.success(function(_id) {
item._id = _id;
[3/5] incubator-ignite git commit: # ignite-843 WIP error sending.
Posted by an...@apache.org.
# ignite-843 WIP error sending.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/494cb37e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/494cb37e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/494cb37e
Branch: refs/heads/ignite-843
Commit: 494cb37ee2f1e01279e0ab946b9865452c087d9a
Parents: ae2740b
Author: Andrey <an...@gridgain.com>
Authored: Fri Jun 5 13:59:15 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Jun 5 13:59:15 2015 +0700
----------------------------------------------------------------------
modules/webconfig/nodejs/routes/caches.js | 10 +++++-----
modules/webconfig/nodejs/routes/clusters.js | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/494cb37e/modules/webconfig/nodejs/routes/caches.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/routes/caches.js b/modules/webconfig/nodejs/routes/caches.js
index 1d43d8d..c4dfc9f 100644
--- a/modules/webconfig/nodejs/routes/caches.js
+++ b/modules/webconfig/nodejs/routes/caches.js
@@ -30,7 +30,7 @@ function selectAll(req, res) {
// Get owned space and all accessed space.
db.Space.find({$or: [{owner: user_id}, {usedBy: {$elemMatch: {account: user_id}}}]}, function (err, spaces) {
if (err)
- return res.status(500).send(err);
+ return res.status(500).send(err.message);
var space_ids = spaces.map(function(value, index) {
return value._id;
@@ -39,7 +39,7 @@ function selectAll(req, res) {
// Get all caches for spaces.
db.Cache.find({space: {$in: space_ids}}, function (err, caches) {
if (err)
- return res.status(500).send(err);
+ return res.status(500).send(err.message);
res.json({spaces: spaces, caches: caches});
});
@@ -60,7 +60,7 @@ router.post('/save', function(req, res) {
if (req.body._id)
db.Cache.update({_id: req.body._id}, req.body, {upsert: true}, function(err) {
if (err)
- return res.send(err);
+ return res.status(500).send(err.message);
res.sendStatus(200);
});
@@ -69,7 +69,7 @@ router.post('/save', function(req, res) {
cache.save(function(err, cache) {
if (err)
- return res.send(err.message);
+ return res.status(500).send(err.message);
res.send(cache._id);
});
@@ -82,7 +82,7 @@ router.post('/save', function(req, res) {
router.post('/remove', function(req, res) {
db.Cache.remove(req.body, function (err) {
if (err)
- return res.send(err);
+ return res.status(500).send(err.message);
res.sendStatus(200);
})
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/494cb37e/modules/webconfig/nodejs/routes/clusters.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/routes/clusters.js b/modules/webconfig/nodejs/routes/clusters.js
index b8f123b..da2b347 100644
--- a/modules/webconfig/nodejs/routes/clusters.js
+++ b/modules/webconfig/nodejs/routes/clusters.js
@@ -30,7 +30,7 @@ function selectAll(req, res) {
// Get owned space and all accessed space.
db.Space.find({$or: [{owner: user_id}, {usedBy: {$elemMatch: {account: user_id}}}]}, function (err, spaces) {
if (err)
- return res.status(500).send(err);
+ return res.status(500).send(err.message);
var space_ids = spaces.map(function(value) {
return value._id;
@@ -43,7 +43,7 @@ function selectAll(req, res) {
// Get all clusters for spaces.
db.Cluster.find({space: {$in: space_ids}}, function (err, clusters) {
if (err)
- return res.status(500).send(err);
+ return res.status(500).send(err.message);
var cachesJson = caches.map(function(cache) {
return {value: cache._id, label: cache.name};
@@ -69,7 +69,7 @@ router.post('/save', function(req, res) {
if (req.body._id)
db.Cluster.update({_id: req.body._id}, req.body, {upsert: true}, function(err) {
if (err)
- return res.send(err);
+ return res.status(500).send(err.message);
res.sendStatus(200);
});
@@ -78,7 +78,7 @@ router.post('/save', function(req, res) {
cluster.save(function(err, cluster) {
if (err)
- return res.send(err.message);
+ return res.status(500).send(err.message);
res.send(cluster._id);
});
@@ -91,7 +91,7 @@ router.post('/save', function(req, res) {
router.post('/remove', function(req, res) {
db.Cluster.remove(req.body, function (err) {
if (err)
- return res.send(err);
+ return res.status(500).send(err.message);
res.sendStatus(200);
})
[4/5] 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/a6fc0382
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a6fc0382
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a6fc0382
Branch: refs/heads/ignite-843
Commit: a6fc03821ac74f5587b2755329ab14c7e2fdf984
Parents: 494cb37 f2dc46e
Author: Andrey <an...@gridgain.com>
Authored: Fri Jun 5 14:29:56 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Jun 5 14:29:56 2015 +0700
----------------------------------------------------------------------
modules/webconfig/nodejs/views/caches.jade | 11 ++++++++---
modules/webconfig/nodejs/views/includes/controls.jade | 5 ++++-
2 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[2/5] 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/ae2740b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ae2740b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ae2740b2
Branch: refs/heads/ignite-843
Commit: ae2740b2aa1e4a2e3ab21edf7cf69ff090d063a9
Parents: 2f59011 7aab341
Author: Andrey <an...@gridgain.com>
Authored: Fri Jun 5 13:57:12 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Jun 5 13:57:12 2015 +0700
----------------------------------------------------------------------
modules/webconfig/nodejs/public/form-models/caches.json | 10 ++++++++++
.../nodejs/public/javascripts/controllers/caches.js | 10 ++++------
modules/webconfig/nodejs/views/caches.jade | 5 +++++
modules/webconfig/nodejs/views/includes/controls.jade | 2 +-
4 files changed, 20 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[5/5] incubator-ignite git commit: # ignite-843 WIP.
Posted by an...@apache.org.
# ignite-843 WIP.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/04508dc0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/04508dc0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/04508dc0
Branch: refs/heads/ignite-843
Commit: 04508dc038143ff5928fafff980e07044ac3cc89
Parents: a6fc038
Author: Andrey <an...@gridgain.com>
Authored: Fri Jun 5 14:45:23 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Jun 5 14:45:23 2015 +0700
----------------------------------------------------------------------
.../nodejs/public/form-models/clusters.json | 2 +-
modules/webconfig/nodejs/views/caches.jade | 26 +++++------
modules/webconfig/nodejs/views/clusters.jade | 6 +--
.../nodejs/views/includes/controls.jade | 49 ++++++++++++--------
4 files changed, 45 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/04508dc0/modules/webconfig/nodejs/public/form-models/clusters.json
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/public/form-models/clusters.json b/modules/webconfig/nodejs/public/form-models/clusters.json
index 19b9097..bdd12df 100644
--- a/modules/webconfig/nodejs/public/form-models/clusters.json
+++ b/modules/webconfig/nodejs/public/form-models/clusters.json
@@ -7,7 +7,7 @@
},
{
"label": "Discovery",
- "type": "dropdown",
+ "type": "dropdown-details",
"model": "discovery.kind",
"placeholder": "Choose discovery",
"items": "discoveries",
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/04508dc0/modules/webconfig/nodejs/views/caches.jade
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/views/caches.jade b/modules/webconfig/nodejs/views/caches.jade
index 9b69f00..e02d347 100644
--- a/modules/webconfig/nodejs/views/caches.jade
+++ b/modules/webconfig/nodejs/views/caches.jade
@@ -42,25 +42,23 @@ block content
form.form-horizontal(name='editForm' ng-if='backupItem')
h3 General
.settings-row(ng-repeat='field in general')
- div(ng-switch on='field.type')
- +form-row
+ +form-row
.panel(bs-collapse data-start-collapsed='true')
.panel-collapse(bs-collapse-target)
div(ng-repeat='group in advanced')
h3 {{group.label}}
.settings-row(ng-repeat='field in group.fields')
- div(ng-switch on='field.type')
- +form-row
- div(ng-switch-when='idxTypes')
- div
- label.col-sm-2 Key class:
- .col-sm-3
- +edt('create.keyCls', 'Fully qualified key class name')
- +tip
- div
- label.col-sm-2 Value class:
- .col-sm-3
- +edt('create.valCls', 'Fully qualified value class name')
+ +form-row
+ div(ng-switch-when='idxTypes')
+ div
+ label.col-sm-2 Key class:
+ .col-sm-3
+ +edt('create.keyCls', 'Fully qualified key class name')
+ +tip
+ div
+ label.col-sm-2 Value class:
+ .col-sm-3
+ +edt('create.valCls', 'Fully qualified value class name')
.panel-heading
.panel-title
span(bs-collapse-toggle)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/04508dc0/modules/webconfig/nodejs/views/clusters.jade
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/views/clusters.jade b/modules/webconfig/nodejs/views/clusters.jade
index 6021005..4b95b5e 100644
--- a/modules/webconfig/nodejs/views/clusters.jade
+++ b/modules/webconfig/nodejs/views/clusters.jade
@@ -42,15 +42,13 @@ block content
form.form-horizontal(name='editForm' ng-if='backupItem')
h3 General
.settings-row(ng-repeat='field in general')
- div(ng-switch on='field.type')
- +form-row
+ +form-row
.panel(bs-collapse data-start-collapsed='true')
.panel-collapse(bs-collapse-target)
div(ng-repeat='group in advanced')
h3 {{group.label}}
.settings-row(ng-repeat='field in group.fields')
- div(ng-switch on='field.type')
- +form-row
+ +form-row
.panel-heading
.panel-title
span(bs-collapse-toggle)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/04508dc0/modules/webconfig/nodejs/views/includes/controls.jade
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/views/includes/controls.jade b/modules/webconfig/nodejs/views/includes/controls.jade
index 8c28ff0..f831c89 100644
--- a/modules/webconfig/nodejs/views/includes/controls.jade
+++ b/modules/webconfig/nodejs/views/includes/controls.jade
@@ -21,22 +21,33 @@ mixin edt(mdl, ph)
input.form-control(type='text' ng-model=mdl placeholder=ph)
mixin form-row
- div(ng-switch-when='check')
- input(type='checkbox' ng-model='backupItem[field.model]')
- label(ng-click='backupItem[field.model] = !backupItem[field.model]') {{field.label}}
- +tip
- div(ng-switch-when='text')
- label.col-sm-2 {{field.label}}:
- .col-sm-3
- +edt('backupItem[field.model]', '{{field.placeholder}}')
- +tip
- div(ng-switch-when='dropdown')
- label.col-sm-2 {{field.label}}:
- .col-sm-3
- button.form-control(bs-select ng-model='backupItem[field.model]' data-template='/select' data-placeholder='{{field.placeholder}}' bs-options='item.value as item.label for item in {{field.items}}')
- +tip
- div(ng-switch-when='dropdown-multiple')
- label.col-sm-2 {{field.label}}:
- .col-sm-3
- button.form-control(bs-select ng-model='backupItem[field.model]' data-multiple='1' data-template='/select' data-placeholder='{{field.placeholder}}' bs-options='item.value as item.label for item in {{field.items}}')
- +tip
+ div(ng-switch='field.type')
+ div(ng-switch-when='check')
+ input(type='checkbox' ng-model='backupItem[field.model]')
+ label(ng-click='backupItem[field.model] = !backupItem[field.model]') {{field.label}}
+ +tip
+ div(ng-switch-when='text')
+ label.col-sm-2 {{field.label}}:
+ .col-sm-3
+ +edt('backupItem[field.model]', '{{field.placeholder}}')
+ +tip
+ div(ng-switch-when='dropdown')
+ label.col-sm-2 {{field.label}}:
+ .col-sm-3
+ button.form-control(bs-select ng-model='backupItem[field.model]' data-template='/select' data-placeholder='{{field.placeholder}}' bs-options='item.value as item.label for item in {{field.items}}')
+ +tip
+ div(ng-switch-when='dropdown-multiple')
+ label.col-sm-2 {{field.label}}:
+ .col-sm-3
+ button.form-control(bs-select ng-model='backupItem[field.model]' data-multiple='1' data-template='/select' data-placeholder='{{field.placeholder}}' bs-options='item.value as item.label for item in {{field.items}}')
+ +tip
+ div(ng-switch-when='dropdown-details')
+ label.col-sm-2 {{field.label}}:
+ .col-sm-3
+ button.form-control(bs-select ng-model='backupItem[field.model]' data-template='/select' data-placeholder='{{field.placeholder}}' bs-options='item.value as item.label for item in {{field.items}}')
+ +tip
+ div(ng-switch='backupItem[field.model]')
+ div(ng-switch-when='Vm')
+ label.col-sm-2 {{backupItem[field.model]}}:
+ div(ng-switch-when='Multicast')
+ label.col-sm-2 {{backupItem[field.model]}}:
\ No newline at end of file