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

Merge pull request #292 from dkanada/auto

Browse source 
Fix some issues with the user preference page
This commit is contained in:
Joshua M. Boniface 2019-04-30 23:50:05 -04:00 • committed by GitHub
commit 8b703187d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 49 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/controllers/loginpage.js
View file

@ -146,12 +146,8 @@ define(["apphost", "appSettings", "dom", "connectionManager", "loading", "cardSt
var apiClient = getApiClient();
apiClient.getPublicUsers().then(function(users) {
if (users.length) {
if (users[0].EnableAutoLogin) {
authenticateUserByName(view, apiClient, users[0].Name, "");
} else {
showVisualForm();
loadUserList(view, apiClient, users);
}
showVisualForm();
loadUserList(view, apiClient, users);
} else {
view.querySelector("#txtManualName").value = "";
showManualForm(view, false, false);

29
src/controllers/mypreferencescommon.js
View file

@ -7,14 +7,15 @@ define(["apphost", "connectionManager", "listViewStyle", "emby-button"], functio
});
view.addEventListener("viewshow", function() {
var page = this;
// this page can also be used by admins to change user preferences from the user edit page
var userId = params.userId || Dashboard.getCurrentUserId();
var page = this;
page.querySelector(".lnkDisplayPreferences").setAttribute("href", "mypreferencesdisplay.html?userId=" + userId);
page.querySelector(".lnkLanguagePreferences").setAttribute("href", "mypreferenceslanguages.html?userId=" + userId);
page.querySelector(".lnkSubtitleSettings").setAttribute("href", "mypreferencessubtitles.html?userId=" + userId);
page.querySelector(".lnkHomeScreenPreferences").setAttribute("href", "mypreferenceshome.html?userId=" + userId);
page.querySelector(".lnkMyProfile").setAttribute("href", "myprofile.html?userId=" + userId);
page.querySelector(".lnkDisplayPreferences").setAttribute("href", "mypreferencesdisplay.html?userId=" + userId);
page.querySelector(".lnkHomePreferences").setAttribute("href", "mypreferenceshome.html?userId=" + userId);
page.querySelector(".lnkLanguagePreferences").setAttribute("href", "mypreferenceslanguages.html?userId=" + userId);
page.querySelector(".lnkSubtitlePreferences").setAttribute("href", "mypreferencessubtitles.html?userId=" + userId);
if (appHost.supports("multiserver")) {
page.querySelector(".selectServer").classList.remove("hide")
@ -22,19 +23,15 @@ define(["apphost", "connectionManager", "listViewStyle", "emby-button"], functio
page.querySelector(".selectServer").classList.add("hide");
}
connectionManager.user(ApiClient).then(function(user) {
if (user.localUser && !user.localUser.EnableAutoLogin) {
view.querySelector(".btnLogout").classList.remove("hide");
} else {
view.querySelector(".btnLogout").classList.add("hide");
}
});
// hide the actions if user preferences are being edited for a different user
if (params.userId && params.userId !== Dashboard.getCurrentUserId) {
page.querySelector(".userSection").classList.add("hide");
page.querySelector(".adminSection").classList.add("hide");
}
Dashboard.getCurrentUser().then(function(user) {
ApiClient.getUser(userId).then(function(user) {
page.querySelector(".headerUsername").innerHTML = user.Name;
if (user.Policy.IsAdministrator) {
page.querySelector(".adminSection").classList.remove("hide");
} else {
if (!user.Policy.IsAdministrator) {
page.querySelector(".adminSection").classList.add("hide");
}
});