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 from dev

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-14 10:43:03 -05:00
parent 1c8f02ce0f
commit 33b01d778c
911 changed files with 34157 additions and 57125 deletions
Download patch file Download diff file Expand all files Collapse all files

14
dashboard-ui/scripts/usernew.js
View file

@ -70,10 +70,10 @@
var promise5 = ApiClient.getJSON(ApiClient.getUrl("Channels"));
$.when(promise4, promise5).done(function (response4, response5) {
Promise.all([promise4, promise5]).then(function (responses) {
loadMediaFolders(page, response4[0].Items);
loadChannels(page, response5[0].Items);
loadMediaFolders(page, responses[0].Items);
loadChannels(page, responses[1].Items);
Dashboard.hideLoadingMsg();
});
@ -83,7 +83,7 @@
var name = $('#txtUserName', page).val();
ApiClient.createUser(name).done(function (user) {
ApiClient.createUser(name).then(function (user) {
user.Policy.EnableAllFolders = $('#chkEnableAllFolders', page).checked();
user.Policy.EnabledFolders = user.Policy.EnableAllFolders ?
@ -103,13 +103,13 @@
}).get();
ApiClient.updateUserPolicy(user.Id, user.Policy).done(function () {
ApiClient.updateUserPolicy(user.Id, user.Policy).then(function () {
Dashboard.navigate("useredit.html?userId=" + user.Id);
});
}).fail(function() {
}, function () {
Dashboard.showError(Globalize.translate('DefaultErrorMessage'));
Dashboard.alert(Globalize.translate('DefaultErrorMessage'));
Dashboard.hideLoadingMsg();
});
}