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 #75 from nvllsvm/misc

Browse source 
User profile fixes
This commit is contained in:
Andrew Rabert 2019-01-26 14:02:00 -05:00 • committed by GitHub
commit 0474bcfa8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/scripts/useredit.js
View file

@ -32,13 +32,11 @@ define(["jQuery", "loading", "libraryMenu", "fnchecked"], function($, loading, l
}
function onSaveComplete(page, user) {
loading.hide(), (currentUser.ConnectUserName || "") == $("#txtConnectUserName", page).val() ? require(["toast"], function(toast) {
toast(Globalize.translate("SettingsSaved"))
}) : require(["connectHelper"], function(connectHelper) {
connectHelper.updateUserLink(ApiClient, user, $("#txtConnectUserName", page).val()).then(function() {
loadData(page)
})
})
Dashboard.navigate("userprofiles.html");
loading.hide();
require(["toast"], function(toast) {
toast(Globalize.translate("SettingsSaved"));
});
}
function saveUser(user, page) {
@ -82,4 +80,4 @@ define(["jQuery", "loading", "libraryMenu", "fnchecked"], function($, loading, l
}).on("pagebeforeshow", "#editUserPage", function() {
loadData(this)
})
});
});

43
src/scripts/userprofilespage.js
View file

@ -242,48 +242,11 @@ define(["loading", "dom", "globalize", "humanedate", "paper-icon-button-light",
});
}
function showNewUserDialog(e__w) {
require(["dialog"], function (dialog) {
var items = [];
items.push({
name: globalize.translate("HeaderAddLocalUser"),
id: "manual",
type: "submit",
description: globalize.translate("AddUserByManually")
});
// TODO cvium
// items.push({
// name: globalize.translate("HeaderInviteUser"),
// id: "invite",
// description: globalize.translate("HeaderInviteUserHelp")
// });
items.push({
name: globalize.translate("sharedcomponents#ButtonCancel"),
id: "cancel",
type: "cancel"
});
var options = {
title: globalize.translate("ButtonAddUser"),
text: globalize.translate("HowWouldYouLikeToAddUser")
};
options.buttons = items;
return dialog(options).then(function (result) {
var view = dom.parentWithClass(e__w.target, "page");
debugger;
if ("invite" === result) {
showInvitePopup(view);
} else {
if ("manual" === result) {
Dashboard.navigate("usernew.html");
}
}
});
});
}
pageIdOn("pageinit", "userProfilesPage", function () {
var page = this;
page.querySelector(".btnAddUser").addEventListener("click", showNewUserDialog);
page.querySelector(".btnAddUser").addEventListener("click", function() {
Dashboard.navigate("usernew.html");
});
page.querySelector(".localUsers").addEventListener("click", function (e__e) {
var btnUserMenu = dom.parentWithClass(e__e.target, "btnUserMenu");