Compare commits

...

4 Commits
2.0.0 ... 2.0.1

Author SHA1 Message Date
Athou
78b1ec6e6a 2.0.1 2014-08-13 03:23:06 +02:00
Athou
6d4cbb889d increase connections in redis pool 2014-08-13 03:03:53 +02:00
Athou
27d16265d6 autofilled fields do not trigger model update, do it manually 2014-08-13 02:51:53 +02:00
Athou
9888e23cd9 next version 2014-08-12 20:49:00 +02:00
3 changed files with 56 additions and 50 deletions

View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.commafeed</groupId>
<artifactId>commafeed</artifactId>
<version>2.0.0</version>
<version>2.0.1</version>
<packaging>jar</packaging>
<name>CommaFeed</name>

View File

@@ -1460,55 +1460,61 @@ module.controller('MetricsCtrl', ['$scope', 'AdminMetricsService', function($sco
$scope.metrics = AdminMetricsService.get();
}]);
module.controller('LoginCtrl', ['$scope', '$location', 'SessionService', 'ServerService', function($scope, $location, SessionService, ServerService) {
$scope.model = {};
$scope.recovery_model = {};
$scope.recovery = false;
$scope.recovery_enabled = false;
ServerService.get(function(data) {
$scope.recovery_enabled = data.smtpEnabled;
});
var login = function(model) {
var success = function(data) {
window.location.href = window.location.href.substring(0, window.location.href.lastIndexOf('#'));
};
var error = function(data) {
$scope.message = data.data;
};
SessionService.login({
name : model.name,
password : model.password
}, success, error);
}
$scope.demoLogin = function() {
login({
name : 'demo',
password : 'demo'
});
};
module.controller('LoginCtrl', ['$scope', '$location', '$timeout', 'SessionService', 'ServerService',
function($scope, $location, $timeout, SessionService, ServerService) {
$scope.model = {};
$scope.recovery_model = {};
$scope.recovery = false;
$scope.recovery_enabled = false;
$scope.login = function() {
login($scope.model);
};
$scope.toggleRecovery = function() {
$scope.recovery = !$scope.recovery;
};
var recovery_success = function(data) {
$scope.recovery_message = "Email has ben sent. Check your inbox.";
};
var recovery_error = function(data) {
$scope.recovery_message = data.data;
};
$scope.recover = function() {
SessionService.passwordReset({
email : $scope.recovery_model.email
}, recovery_success, recovery_error);
}
}]);
ServerService.get(function(data) {
$scope.recovery_enabled = data.smtpEnabled;
});
// autofilled fields do not trigger model update, do it manually
$timeout(function() {
$('input[ng-model]').trigger('input');
}, 100);
var login = function(model) {
var success = function(data) {
window.location.href = window.location.href.substring(0, window.location.href.lastIndexOf('#'));
};
var error = function(data) {
$scope.message = data.data;
};
SessionService.login({
name : model.name,
password : model.password
}, success, error);
}
$scope.demoLogin = function() {
login({
name : 'demo',
password : 'demo'
});
};
$scope.login = function() {
login($scope.model);
};
$scope.toggleRecovery = function() {
$scope.recovery = !$scope.recovery;
};
var recovery_success = function(data) {
$scope.recovery_message = "Email has ben sent. Check your inbox.";
};
var recovery_error = function(data) {
$scope.recovery_message = data.data;
};
$scope.recover = function() {
SessionService.passwordReset({
email : $scope.recovery_model.email
}, recovery_success, recovery_error);
}
}]);
module.controller('RegisterCtrl', ['$scope', '$location', 'SessionService', 'ServerService',
function($scope, $location, SessionService, ServerService) {

View File

@@ -29,7 +29,7 @@ public class RedisCacheService extends CacheService {
public RedisCacheService() {
JedisPoolConfig config = new JedisPoolConfig();
config.setBlockWhenExhausted(false);
config.setMaxTotal(500);
pool = new JedisPool(config, "localhost");
}