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/12 08:19:14 UTC
[1/2] ignite git commit: IGNITE-843 Fixed eslint warnings.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 fdf9ddc4e -> f3a0a5e9f
IGNITE-843 Fixed eslint warnings.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4f79a2df
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4f79a2df
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4f79a2df
Branch: refs/heads/ignite-843-rc2
Commit: 4f79a2df23dc21ab7c3364ac33ff825e07a9e7a9
Parents: fdf9ddc
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Feb 12 14:18:36 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Feb 12 14:18:36 2016 +0700
----------------------------------------------------------------------
modules/control-center-web/src/main/js/.eslintrc | 2 +-
modules/control-center-web/src/main/js/serve/mongo.js | 10 +++++-----
.../control-center-web/src/main/js/serve/routes/admin.js | 8 ++++----
3 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4f79a2df/modules/control-center-web/src/main/js/.eslintrc
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/.eslintrc b/modules/control-center-web/src/main/js/.eslintrc
index b18ff6d..9174e14 100644
--- a/modules/control-center-web/src/main/js/.eslintrc
+++ b/modules/control-center-web/src/main/js/.eslintrc
@@ -56,7 +56,7 @@ rules:
generator-star-spacing: 0
guard-for-in: 1
handle-callback-err: 0
- id-length: [2, {"min": 1, "max": 30}]
+ id-length: [2, {"min": 1, "max": 40}]
indent: [2, 4, {"SwitchCase": 1}]
key-spacing: [2, { "beforeColon": false, "afterColon": true }]
lines-around-comment: 0
http://git-wip-us.apache.org/repos/asf/ignite/blob/4f79a2df/modules/control-center-web/src/main/js/serve/mongo.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/mongo.js b/modules/control-center-web/src/main/js/serve/mongo.js
index 3768e77..c0d5228 100644
--- a/modules/control-center-web/src/main/js/serve/mongo.js
+++ b/modules/control-center-web/src/main/js/serve/mongo.js
@@ -56,7 +56,7 @@ module.exports.factory = function(deepPopulatePlugin, passportMongo, settings, p
// Configure transformation to JSON.
AccountSchema.set('toJSON', {
- transform: function(doc, ret) {
+ transform: (doc, ret) => {
return {
_id: ret._id,
email: ret.email,
@@ -524,16 +524,16 @@ module.exports.factory = function(deepPopulatePlugin, passportMongo, settings, p
// Define Notebook model.
result.Notebook = mongoose.model('Notebook', NotebookSchema);
- result.upsert = function(model, data, cb) {
+ result.upsert = function(Model, data, cb) {
if (data._id) {
const id = data._id;
delete data._id;
- model.findOneAndUpdate({_id: id}, data, cb);
+ Model.findOneAndUpdate({_id: id}, data, cb);
}
else
- new model(data).save(cb);
+ new Model(data).save(cb);
};
result.processed = function(err, res) {
@@ -547,7 +547,7 @@ module.exports.factory = function(deepPopulatePlugin, passportMongo, settings, p
};
// Registering the routes of all plugin modules
- for (var name in pluginMongo) {
+ for (const name in pluginMongo) {
if (pluginMongo.hasOwnProperty(name))
pluginMongo[name].register(mongoose, deepPopulate, result);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4f79a2df/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 09e6c21..765b8e8 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
@@ -40,14 +40,14 @@ module.exports.factory = function(_, express, nodemailer, settings, mongo) {
// Remove user.
router.post('/remove', function(req, res) {
- var userId = req.body.userId;
+ const userId = req.body.userId;
mongo.Account.findByIdAndRemove(userId, function(err, user) {
if (err)
return res.status(500).send(err.message);
mongo.Space.find({owner: userId}, function(err, spaces) {
- _.forEach(spaces, function(space) {
+ _.forEach(spaces, (space) => {
mongo.Cluster.remove({space: space._id}).exec();
mongo.Cache.remove({space: space._id}).exec();
mongo.DomainModel.remove({space: space._id}).exec();
@@ -56,7 +56,7 @@ module.exports.factory = function(_, express, nodemailer, settings, mongo) {
});
});
- var transporter = {
+ const transporter = {
service: settings.smtp.service,
auth: {
user: settings.smtp.email,
@@ -110,7 +110,7 @@ module.exports.factory = function(_, express, nodemailer, settings, mongo) {
req.session.viewedUser = viewedUser;
return res.sendStatus(200);
- })
+ });
});
// Become user.
[2/2] ignite git commit: IGNITE-843 Fixed dropdown container binding
to proper modal.
Posted by ak...@apache.org.
IGNITE-843 Fixed dropdown container binding to proper modal.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f3a0a5e9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f3a0a5e9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f3a0a5e9
Branch: refs/heads/ignite-843-rc2
Commit: f3a0a5e9f4e21bbdd5de2f56df7dbff19a30b5c3
Parents: 4f79a2d
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Feb 12 14:19:28 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Feb 12 14:19:28 2016 +0700
----------------------------------------------------------------------
.../main/js/views/configuration/domains-import.jade | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f3a0a5e9/modules/control-center-web/src/main/js/views/configuration/domains-import.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/domains-import.jade b/modules/control-center-web/src/main/js/views/configuration/domains-import.jade
index d1877bd..759eb9e 100644
--- a/modules/control-center-web/src/main/js/views/configuration/domains-import.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/domains-import.jade
@@ -23,7 +23,7 @@ mixin td-ellipses-lbl(w, lbl)
td.td-ellipsis(width='#{w}' style='min-width: #{w}; max-width: #{w}')
label #{lbl}
-.modal.center(role='dialog')
+.modal.modal-domain-import.center(role='dialog')
.modal-dialog
.modal-content(dw-loading='importDomainFromDb' dw-loading-options='importDomain.loadingOptions')
#errors-container.modal-header.header
@@ -58,7 +58,7 @@ mixin td-ellipses-lbl(w, lbl)
.col-xs-8.col-sm-10.col-md-10
i.tipField.fa.fa-question-circle(bs-tooltip='' data-title='Select appropriate JAR with JDBC driver<br> To add another driver you need to place it into "/jdbc-drivers" folder of Ignite Web Agent<br> Refer to Ignite Web Agent README.txt for for more information')
.input-tip
- button.select-toggle.form-control(id='jdbcDriverJar' bs-select data-container='.modal' ng-model='ui.selectedJdbcDriverJar' ng-class='{placeholder: !(jdbcDriverJars && jdbcDriverJars.length > 0)}' placeholder='Choose JDBC driver' bs-options='item.value as item.label for item in jdbcDriverJars')
+ button.select-toggle.form-control(id='jdbcDriverJar' bs-select data-container='.modal-domain-import' ng-model='ui.selectedJdbcDriverJar' ng-class='{placeholder: !(jdbcDriverJars && jdbcDriverJars.length > 0)}' placeholder='Choose JDBC driver' bs-options='item.value as item.label for item in jdbcDriverJars')
.settings-row
label.col-xs-4.col-sm-2.col-md-2 JDBC Driver:
.col-xs-8.col-sm-10.col-md-10
@@ -144,9 +144,9 @@ mixin td-ellipses-lbl(w, lbl)
div.td-ellipsis
a(ng-if='!table.edit' ng-click='startEditDbTableCache(table)') {{tableActionView(table)}}
div(style='display: flex' ng-if='table.edit')
- button.select-toggle.form-control(style='width: 35%; margin-right: 5px' bs-select ng-model='table.action' data-container='.modal' bs-options='item.value as item.shortLabel for item in importActions')
- button.select-toggle.form-control(style='width: 65%; margin-right: 0' bs-select ng-model='table.cacheOrTemplate' data-container='.modal' bs-options='item.value as item.label for item in table.cachesOrTemplates')
- //- button.select-toggle.form-control(ng-if='table.action==2' style='width: 65%; margin-right: 0' bs-select ng-model='table.cache' data-container='.modal' bs-options='item.value as item.label for item in importCurrentCaches')
+ button.select-toggle.form-control(style='width: 35%; margin-right: 5px' bs-select ng-model='table.action' data-container='.modal-domain-import' bs-options='item.value as item.shortLabel for item in importActions')
+ button.select-toggle.form-control(style='width: 65%; margin-right: 0' bs-select ng-model='table.cacheOrTemplate' data-container='.modal-domain-import' bs-options='item.value as item.label for item in table.cachesOrTemplates')
+ //- button.select-toggle.form-control(ng-if='table.action==2' style='width: 65%; margin-right: 0' bs-select ng-model='table.cache' data-container='.modal-domain-import' bs-options='item.value as item.label for item in importCurrentCaches')
td
.settings-row
label Defaults to be applied for filtered tables
@@ -154,9 +154,9 @@ mixin td-ellipses-lbl(w, lbl)
.settings-row
.col-sm-11
.col-sm-6(style='padding-right: 5px')
- button.select-toggle.form-control(bs-select ng-model='importCommon.action' data-container='.modal' bs-options='item.value as item.label for item in importActions')
+ button.select-toggle.form-control(bs-select ng-model='importCommon.action' data-container='.modal-domain-import' bs-options='item.value as item.label for item in importActions')
.col-sm-6(style='padding-left: 5px; padding-right: 5px')
- button.select-toggle.form-control(bs-select ng-model='importCommon.cacheOrTemplate' data-container='.modal' bs-options='item.value as item.label for item in importCommon.cachesOrTemplates')
+ button.select-toggle.form-control(bs-select ng-model='importCommon.cacheOrTemplate' data-container='.modal-domain-import' bs-options='item.value as item.label for item in importCommon.cachesOrTemplates')
.col-sm-1(style='padding-left: 5px')
button.btn.btn-primary(ng-click='applyDefaults()') Apply
.import-domain-model-wizard-page(ng-show='importDomain.action == "options"' style='margin-bottom: 176px')
@@ -186,7 +186,7 @@ mixin td-ellipses-lbl(w, lbl)
.col-xs-9.col-sm-10.col-md-10
i.tipField.fa.fa-question-circle(bs-tooltip='' data-title='Choose clusters that will be associated with generated caches')
.input-tip
- button.select-toggle.form-control(id='generatedCachesClusters' bs-select ng-model='ui.generatedCachesClusters' ng-class='{placeholder: !(ui.generatedCachesClusters && ui.generatedCachesClusters.length > 0)}' data-container='.modal' data-multiple='1' placeholder='Choose clusters for generated caches' bs-options='item.value as item.label for item in clusters')
+ button.select-toggle.form-control(id='generatedCachesClusters' bs-select ng-model='ui.generatedCachesClusters' ng-class='{placeholder: !(ui.generatedCachesClusters && ui.generatedCachesClusters.length > 0)}' data-container='.modal-domain-import' data-multiple='1' placeholder='Choose clusters for generated caches' bs-options='item.value as item.label for item in clusters')
.modal-footer
label(ng-hide='importDomain.action == "drivers" || (importDomain.action == "connect" && importDomain.demo)').labelField {{importDomain.info}}
a.btn.btn-primary(ng-hide='importDomain.action == "drivers" || importDomain.action == "connect"' ng-click='importDomainPrev()' bs-tooltip='' data-title='{{prevTooltipText()}}' data-placement='bottom') Prev