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

fixes #408 - Apostrophes in profile names are bad.

Browse source
This commit is contained in:
Luke Pulverenti 2013-07-30 21:35:23 -04:00
parent 3ddd2bac8d
commit 15dba917aa
2 changed files with 26 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -59,37 +59,41 @@
authenticateUserLink: function (link) { authenticateUserLink: function (link) {
LoginPage.authenticateUser(link.getAttribute('data-username'), link.getAttribute('data-userid')); LoginPage.authenticateUser(link.getAttribute('data-userid'));
}, },
authenticateUser: function (username, password) { authenticateUser: function (userId, password) {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
ApiClient.authenticateUserByName(username, password).done(function (result) { ApiClient.getUser(userId).done(function (user) {
ApiClient.authenticateUserByName(user.Name, password).done(function (result) {
var user = result.User; user = result.User;
Dashboard.setCurrentUser(user.Id); Dashboard.setCurrentUser(user.Id);
if (user.Configuration.IsAdministrator) { if (user.Configuration.IsAdministrator) {
window.location = "dashboard.html?u=" + user.Id; window.location = "dashboard.html?u=" + user.Id;
} else { } else {
window.location = "index.html?u=" + user.Id; window.location = "index.html?u=" + user.Id;
} }
}).fail(function () { }).fail(function () {
$('#pw', '#loginPage').val(''); $('#pw', '#loginPage').val('');
$('#txtManualName', '#loginPage').val(''); $('#txtManualName', '#loginPage').val('');
$('#txtManualPassword', '#loginPage').val(''); $('#txtManualPassword', '#loginPage').val('');
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
setTimeout(function () { setTimeout(function () {
Dashboard.showError("Invalid user or password."); Dashboard.showError("Invalid user or password.");
}, 300); }, 300);
});
}); });
}, },
loadUserList: function (users) { loadUserList: function (users) {
@ -101,9 +105,9 @@
var linkId = "lnkUser" + i; var linkId = "lnkUser" + i;
if (user.HasPassword) { if (user.HasPassword) {
html += "<a class='posterItem squarePosterItem' id='" + linkId + "' data-username='" + user.Name + "' href='#popupLogin' data-rel='popup' onclick='LoginPage.authenticatingLinkId=this.id;' \">"; html += "<a class='posterItem squarePosterItem' id='" + linkId + "' data-userid='" + user.Id + "' href='#popupLogin' data-rel='popup' onclick='LoginPage.authenticatingLinkId=this.id;' \">";
} else { } else {
html += "<a class='posterItem squarePosterItem' id='" + linkId + "' data-username='" + user.Name + "' href='#' onclick='LoginPage.authenticateUserLink(this);' \">"; html += "<a class='posterItem squarePosterItem' id='" + linkId + "' data-userid='" + user.Id + "' href='#' onclick='LoginPage.authenticateUserLink(this);' \">";
} }
if (user.PrimaryImageTag) { if (user.PrimaryImageTag) {
@ -148,7 +152,7 @@
var link = $('#' + LoginPage.authenticatingLinkId)[0]; var link = $('#' + LoginPage.authenticatingLinkId)[0];
LoginPage.authenticateUser(link.getAttribute('data-username'), $('#pw', '#loginPage').val()); LoginPage.authenticateUser(link.getAttribute('data-userid'), $('#pw', '#loginPage').val());
// Disable default form submission // Disable default form submission
return false; return false;

2
packages.config
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="MediaBrowser.ApiClient.Javascript" version="3.0.153" targetFramework="net45" /> <package id="MediaBrowser.ApiClient.Javascript" version="3.0.155" targetFramework="net45" />
<package id="ServiceStack.Common" version="3.9.56" targetFramework="net45" /> <package id="ServiceStack.Common" version="3.9.56" targetFramework="net45" />
<package id="ServiceStack.Text" version="3.9.55" targetFramework="net45" /> <package id="ServiceStack.Text" version="3.9.55" targetFramework="net45" />
</packages> </packages>