mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

fixed manual login

Browse source
This commit is contained in:
Luke Pulverenti 2013-07-30 21:37:39 -04:00
parent 15dba917aa
commit 3945e0e9f4
1 changed files with 27 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

46
dashboard-ui/scripts/loginpage.js
View file

@ -67,31 +67,39 @@
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
ApiClient.getUser(userId).done(function (user) { ApiClient.getUser(userId).done(function (user) {
ApiClient.authenticateUserByName(user.Name, password).done(function (result) {
user = result.User; LoginPage.authenticateUserByName(user.Name, password);
});
Dashboard.setCurrentUser(user.Id); },
authenticateUserByName: function (username, password) {
if (user.Configuration.IsAdministrator) { Dashboard.showLoadingMsg();
window.location = "dashboard.html?u=" + user.Id;
} else {
window.location = "index.html?u=" + user.Id;
}
}).fail(function () { ApiClient.authenticateUserByName(username, password).done(function (result) {
$('#pw', '#loginPage').val(''); var user = result.User;
$('#txtManualName', '#loginPage').val('');
$('#txtManualPassword', '#loginPage').val('');
Dashboard.hideLoadingMsg(); Dashboard.setCurrentUser(user.Id);
setTimeout(function () { if (user.Configuration.IsAdministrator) {
Dashboard.showError("Invalid user or password."); window.location = "dashboard.html?u=" + user.Id;
}, 300); } else {
}); window.location = "index.html?u=" + user.Id;
}
}).fail(function () {
$('#pw', '#loginPage').val('');
$('#txtManualName', '#loginPage').val('');
$('#txtManualPassword', '#loginPage').val('');
Dashboard.hideLoadingMsg();
setTimeout(function () {
Dashboard.showError("Invalid user or password.");
}, 300);
}); });
}, },
@ -160,7 +168,7 @@
onManualSubmit: function () { onManualSubmit: function () {
LoginPage.authenticateUser($('#txtManualName', '#loginPage').val(), $('#txtManualPassword', '#loginPage').val()); LoginPage.authenticateUserByName($('#txtManualName', '#loginPage').val(), $('#txtManualPassword', '#loginPage').val());
// Disable default form submission // Disable default form submission
return false; return false;