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/03 11:18:49 UTC
incubator-ignite git commit: # ignite-843 Login email to lowercase,
added lastlogin field. Restore selected fixed.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 8a4864ea7 -> 3d97de286
# ignite-843 Login email to lowercase, added lastlogin field. Restore selected fixed.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3d97de28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3d97de28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3d97de28
Branch: refs/heads/ignite-843
Commit: 3d97de286f50f275edd62788b3ef601272ff1cb5
Parents: 8a4864e
Author: Andrey <an...@gridgain.com>
Authored: Fri Jul 3 16:18:45 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Jul 3 16:18:45 2015 +0700
----------------------------------------------------------------------
modules/web-control-center/nodejs/db.js | 5 +++--
.../nodejs/public/javascripts/controllers/caches.js | 7 +++++--
.../nodejs/public/javascripts/controllers/clusters.js | 7 +++++--
.../nodejs/public/javascripts/controllers/persistences.js | 7 +++++--
4 files changed, 18 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d97de28/modules/web-control-center/nodejs/db.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/db.js b/modules/web-control-center/nodejs/db.js
index 48ecbd1..d2aeccf 100644
--- a/modules/web-control-center/nodejs/db.js
+++ b/modules/web-control-center/nodejs/db.js
@@ -28,10 +28,11 @@ mongoose.connect(config.get('mongoDB:url'), {server: {poolSize: 4}});
// Define account model.
var AccountSchema = new Schema({
- username: String
+ username: String,
+ lastLogin: Date
});
-AccountSchema.plugin(passportLocalMongoose, {usernameField: 'email'});
+AccountSchema.plugin(passportLocalMongoose, {usernameField: 'email', limitAttempts: true, lastLoginField: 'lastLogin', usernameLowerCase: true});
exports.Account = mongoose.model('Account', AccountSchema);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d97de28/modules/web-control-center/nodejs/public/javascripts/controllers/caches.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/public/javascripts/controllers/caches.js b/modules/web-control-center/nodejs/public/javascripts/controllers/caches.js
index 8e1d775..e69d54a 100644
--- a/modules/web-control-center/nodejs/public/javascripts/controllers/caches.js
+++ b/modules/web-control-center/nodejs/public/javascripts/controllers/caches.js
@@ -100,10 +100,13 @@ configuratorModule.controller('cachesController', ['$scope', '$alert', '$http',
return cache._id == restoredItem._id;
});
- if (idx >= 0)
+ if (idx >= 0) {
$scope.selectedItem = $scope.caches[idx];
- $scope.backupItem = restoredItem;
+ $scope.backupItem = restoredItem;
+ }
+ else
+ sessionStorage.removeItem('cacheBackupItem');
}
$scope.$watch('backupItem', function (val) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d97de28/modules/web-control-center/nodejs/public/javascripts/controllers/clusters.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/public/javascripts/controllers/clusters.js b/modules/web-control-center/nodejs/public/javascripts/controllers/clusters.js
index e047ac2..a3a3de3 100644
--- a/modules/web-control-center/nodejs/public/javascripts/controllers/clusters.js
+++ b/modules/web-control-center/nodejs/public/javascripts/controllers/clusters.js
@@ -112,10 +112,13 @@ configuratorModule.controller('clustersController', ['$scope', '$alert', '$http'
return cluster._id == restoredItem._id;
});
- if (idx >= 0)
+ if (idx >= 0) {
$scope.selectedItem = $scope.clusters[idx];
- $scope.backupItem = restoredItem;
+ $scope.backupItem = restoredItem;
+ }
+ else
+ sessionStorage.removeItem('clusterBackupItem');
}
$scope.$watch('backupItem', function (val) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d97de28/modules/web-control-center/nodejs/public/javascripts/controllers/persistences.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/public/javascripts/controllers/persistences.js b/modules/web-control-center/nodejs/public/javascripts/controllers/persistences.js
index 0b9b78c..803fc1b 100644
--- a/modules/web-control-center/nodejs/public/javascripts/controllers/persistences.js
+++ b/modules/web-control-center/nodejs/public/javascripts/controllers/persistences.js
@@ -54,10 +54,13 @@ configuratorModule.controller('persistenceController', ['$scope', '$alert', '$ht
return persistence._id == restoredItem._id;
});
- if (idx >= 0)
+ if (idx >= 0) {
$scope.selectedItem = $scope.persistences[idx];
- $scope.backupItem = restoredItem;
+ $scope.backupItem = restoredItem;
+ }
+ else
+ sessionStorage.removeItem('persistenceBackupItem');
}
$scope.$watch('backupItem', function (val) {