From db0f911a4dc52cd7d158aea5e17fd8e51da8f7e6 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 20 Dec 2014 01:06:27 -0500 Subject: [PATCH] start using user policy --- dashboard-ui/css/chromecast.css | 10 +-- .../css/images/currentuserdefaultwhite.png | Bin 2624 -> 0 bytes dashboard-ui/css/images/headersearch.png | Bin 1775 -> 0 bytes .../css/images/items/folders/settings.png | Bin 1509 -> 0 bytes dashboard-ui/css/librarybrowser.css | 2 +- dashboard-ui/css/librarymenu.css | 66 ++++-------------- dashboard-ui/css/notifications.css | 17 +---- dashboard-ui/css/site.css | 2 +- dashboard-ui/library.html | 5 +- dashboard-ui/scripts/indexpage.js | 10 +-- dashboard-ui/scripts/itembynamedetailpage.js | 2 +- dashboard-ui/scripts/itemdetailpage.js | 6 +- dashboard-ui/scripts/itemlistpage.js | 2 +- dashboard-ui/scripts/librarybrowser.js | 4 +- dashboard-ui/scripts/librarylist.js | 2 +- dashboard-ui/scripts/librarymenu.js | 27 +++---- dashboard-ui/scripts/livetvchannel.js | 2 +- dashboard-ui/scripts/livetvprogram.js | 2 +- dashboard-ui/scripts/livetvrecording.js | 2 +- dashboard-ui/scripts/loginpage.js | 2 +- dashboard-ui/scripts/medialibrarypage.js | 16 ++++- dashboard-ui/scripts/mediaplayer.js | 2 +- dashboard-ui/scripts/moviecollections.js | 2 +- dashboard-ui/scripts/movietrailers.js | 2 +- dashboard-ui/scripts/myprofile.js | 4 +- dashboard-ui/scripts/notifications.js | 2 +- dashboard-ui/scripts/site.js | 18 ++--- dashboard-ui/scripts/useredit.js | 43 ++++++------ dashboard-ui/scripts/userlibraryaccess.js | 10 +-- dashboard-ui/scripts/usernew.js | 10 +-- dashboard-ui/scripts/userparentalcontrol.js | 22 +++--- dashboard-ui/scripts/userprofilespage.js | 2 +- .../thirdparty/apiclient/connectionmanager.js | 2 +- dashboard-ui/wizardlibrary.html | 3 +- 34 files changed, 117 insertions(+), 184 deletions(-) delete mode 100644 dashboard-ui/css/images/currentuserdefaultwhite.png delete mode 100644 dashboard-ui/css/images/headersearch.png delete mode 100644 dashboard-ui/css/images/items/folders/settings.png diff --git a/dashboard-ui/css/chromecast.css b/dashboard-ui/css/chromecast.css index ec924216b7..7a7c4de886 100644 --- a/dashboard-ui/css/chromecast.css +++ b/dashboard-ui/css/chromecast.css @@ -3,7 +3,7 @@ background-size: 100%; background-repeat: no-repeat; background-position: center center; - width: 23px; + width: 22px; height: 100%; display: inline-block; } @@ -35,10 +35,4 @@ .headerSelectedPlayer { display: none; } -} - -@media all and (max-width: 400px) { - .btnCastImage { - width: 26px; - } -} +} \ No newline at end of file diff --git a/dashboard-ui/css/images/currentuserdefaultwhite.png b/dashboard-ui/css/images/currentuserdefaultwhite.png deleted file mode 100644 index acfa26e9dedf353e5fb83674577bf56380a57103..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2624 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 wZj84n^5QKRT^7pZ8{H)bmCW^
-
+
- ${MediaFolderHelpPluginRequired}

-
+

'; html += ''; @@ -32,7 +22,7 @@ html += ''; - html += ''; + html += ''; } else { html += ''; @@ -40,24 +30,25 @@ html += ''; - var userButtonHeight = 21; if (user.imageUrl) { + var userButtonHeight = 23; + var url = user.imageUrl; if (user.supportsImageParams) { url += "height=" + userButtonHeight; } - html += ''; + html += ''; } else { - html += ''; + html += '

'; } html += ''; if (user.canManageServer) { - html += ''; + html += '
'; } html += '
'; @@ -170,7 +161,7 @@ Dashboard.getCurrentUser().done(function (user) { - if (user.Configuration.IsAdministrator) { + if (user.Policy.IsAdministrator) { $('.adminMenuOptions').show(); } else { $('.adminMenuOptions').hide(); diff --git a/dashboard-ui/scripts/livetvchannel.js b/dashboard-ui/scripts/livetvchannel.js index b254c26951..51c22664c6 100644 --- a/dashboard-ui/scripts/livetvchannel.js +++ b/dashboard-ui/scripts/livetvchannel.js @@ -149,7 +149,7 @@ $('#playButtonContainer', page).hide(); } - if (user.Configuration.IsAdministrator && item.LocationType !== "Offline") { + if (user.Policy.IsAdministrator && item.LocationType !== "Offline") { $('#editButtonContainer', page).show(); } else { $('#editButtonContainer', page).hide(); diff --git a/dashboard-ui/scripts/livetvprogram.js b/dashboard-ui/scripts/livetvprogram.js index 26bada1887..0199ca7394 100644 --- a/dashboard-ui/scripts/livetvprogram.js +++ b/dashboard-ui/scripts/livetvprogram.js @@ -80,7 +80,7 @@ Dashboard.getCurrentUser().done(function (user) { - if (user.Configuration.IsAdministrator && item.LocationType !== "Offline") { + if (user.Policy.IsAdministrator && item.LocationType !== "Offline") { $('#editButtonContainer', page).show(); } else { $('#editButtonContainer', page).hide(); diff --git a/dashboard-ui/scripts/livetvrecording.js b/dashboard-ui/scripts/livetvrecording.js index 6d2cdc34e4..ab0e739e96 100644 --- a/dashboard-ui/scripts/livetvrecording.js +++ b/dashboard-ui/scripts/livetvrecording.js @@ -71,7 +71,7 @@ $('#playButtonContainer', page).hide(); } - if (user.Configuration.IsAdministrator && item.LocationType !== "Offline") { + if (user.Policy.IsAdministrator && item.LocationType !== "Offline") { $('#deleteButtonContainer', page).show(); } else { $('#deleteButtonContainer', page).hide(); diff --git a/dashboard-ui/scripts/loginpage.js b/dashboard-ui/scripts/loginpage.js index e47e482eca..db346ff8b5 100644 --- a/dashboard-ui/scripts/loginpage.js +++ b/dashboard-ui/scripts/loginpage.js @@ -85,7 +85,7 @@ Dashboard.setCurrentUser(user.Id, result.AccessToken); - if (user.Configuration.IsAdministrator) { + if (user.Policy.IsAdministrator) { window.location = "dashboard.html?u=" + user.Id + '&t=' + result.AccessToken; } else { window.location = "index.html?u=" + user.Id + '&t=' + result.AccessToken; diff --git a/dashboard-ui/scripts/medialibrarypage.js b/dashboard-ui/scripts/medialibrarypage.js index 8281c5df28..3241225513 100644 --- a/dashboard-ui/scripts/medialibrarypage.js +++ b/dashboard-ui/scripts/medialibrarypage.js @@ -12,7 +12,17 @@ .replace('*', '') .replace('&', '&'); + var value = this.value; + $('#txtValue', page).val(name); + + var folderOption = MediaLibraryPage.getCollectionTypeOptions().filter(function (i) { + + return i.value == value; + + })[0]; + + $('.collectionTypeFieldDescription', page).html(folderOption.message || ''); } }); }, @@ -237,12 +247,12 @@ { name: Globalize.translate('FolderTypeMovies'), value: "movies" }, { name: Globalize.translate('FolderTypeMusic'), value: "music" }, { name: Globalize.translate('FolderTypeTvShows'), value: "tvshows" }, - { name: Globalize.translate('FolderTypeBooks') + '*', value: "books" }, - { name: Globalize.translate('FolderTypeGames') + '*', value: "games" }, + { name: Globalize.translate('FolderTypeBooks'), value: "books", message: Globalize.translate('MessageBookPluginRequired') }, + { name: Globalize.translate('FolderTypeGames'), value: "games", message: Globalize.translate('MessageGamePluginRequired') }, { name: Globalize.translate('FolderTypeHomeVideos'), value: "homevideos" }, { name: Globalize.translate('FolderTypeMusicVideos'), value: "musicvideos" }, { name: Globalize.translate('FolderTypePhotos'), value: "photos" }, - { name: Globalize.translate('FolderTypeMixed'), value: "mixed" } + { name: Globalize.translate('FolderTypeMixed'), value: "mixed", message: Globalize.translate('MessageMixedContentHelp') } ]; }, diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index e96556e7c4..39f04472d6 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -295,7 +295,7 @@ return false; } - if (subtitleStream && (subtitleStream.IsGraphicalSubtitleStream || !self.supportsTextTracks())) { + if (subtitleStream && (!subtitleStream.IsTextSubtitleStream || !self.supportsTextTracks())) { console.log('Transcoding because subtitles are required'); return false; } diff --git a/dashboard-ui/scripts/moviecollections.js b/dashboard-ui/scripts/moviecollections.js index 5d50ef303f..006fa5436c 100644 --- a/dashboard-ui/scripts/moviecollections.js +++ b/dashboard-ui/scripts/moviecollections.js @@ -37,7 +37,7 @@ var html = ''; - var addiontalButtonsHtml = user.Configuration.IsAdministrator ? + var addiontalButtonsHtml = user.Policy.IsAdministrator ? ('') : ''; diff --git a/dashboard-ui/scripts/movietrailers.js b/dashboard-ui/scripts/movietrailers.js index d7d77a0109..f4fc5c7772 100644 --- a/dashboard-ui/scripts/movietrailers.js +++ b/dashboard-ui/scripts/movietrailers.js @@ -81,7 +81,7 @@ Dashboard.getCurrentUser().done(function (user) { - if (user.Configuration.EnableMediaPlayback && result.Items.length) { + if (user.Policy.EnableMediaPlayback && result.Items.length) { $('.btnTrailerReel', page).show(); } else { $('.btnTrailerReel', page).hide(); diff --git a/dashboard-ui/scripts/myprofile.js b/dashboard-ui/scripts/myprofile.js index a3e7020316..ccc34183ee 100644 --- a/dashboard-ui/scripts/myprofile.js +++ b/dashboard-ui/scripts/myprofile.js @@ -187,7 +187,7 @@ Dashboard.getCurrentUser().done(function (loggedInUser) { - if (loggedInUser.Configuration.IsAdministrator) { + if (loggedInUser.Policy.IsAdministrator) { $('#lnkParentalControl', page).show(); } else { $('#lnkParentalControl', page).hide(); @@ -367,7 +367,7 @@ Dashboard.getCurrentUser().done(function (loggedInUser) { - if (loggedInUser.Configuration.IsAdministrator) { + if (loggedInUser.Policy.IsAdministrator) { $('#lnkParentalControl', page).show(); } else { $('#lnkParentalControl', page).hide(); diff --git a/dashboard-ui/scripts/notifications.js b/dashboard-ui/scripts/notifications.js index 43e198c7e3..0ece80fdfd 100644 --- a/dashboard-ui/scripts/notifications.js +++ b/dashboard-ui/scripts/notifications.js @@ -218,7 +218,7 @@ $(document).on('headercreated', function (e) { if (ConnectionManager.currentApiClient()) { - $('
0
').insertAfter($('.headerUserButton')).on('click', Notifications.showNotificationsFlyout); + $('
0
').insertBefore($('.headerUserButton')).on('click', Notifications.showNotificationsFlyout); Notifications.updateNotificationCount(); } diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 4c31e12104..960e1c6a8d 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -245,7 +245,7 @@ var Dashboard = { Dashboard.getCurrentUser().done(function (currentUser) { - if (currentUser.Configuration.IsAdministrator) { + if (currentUser.Policy.IsAdministrator) { Dashboard.showServerRestartWarning(info); } }); @@ -570,7 +570,7 @@ var Dashboard = { var isConnectMode = Dashboard.isConnectMode(); - if (user.localUser && user.localUser.Configuration.EnableUserPreferenceAccess) { + if (user.localUser && user.localUser.Policy.EnableUserPreferenceAccess) { html += '

' + Globalize.translate('ButtonMyPreferences') + ''; } @@ -672,7 +672,7 @@ var Dashboard = { link = links[i]; - if (!user.Configuration.IsAdministrator) { + if (!user.Policy.IsAdministrator) { break; } @@ -705,7 +705,7 @@ var Dashboard = { link = links[i]; - if (!user.Configuration.IsAdministrator) { + if (!user.Policy.IsAdministrator) { break; } @@ -892,7 +892,7 @@ var Dashboard = { else if (msg.MessageType === "PackageInstallationCompleted") { Dashboard.getCurrentUser().done(function (currentUser) { - if (currentUser.Configuration.IsAdministrator) { + if (currentUser.Policy.IsAdministrator) { Dashboard.showPackageInstallNotification(msg.Data, "completed"); Dashboard.refreshSystemInfoFromServer(); } @@ -901,7 +901,7 @@ var Dashboard = { else if (msg.MessageType === "PackageInstallationFailed") { Dashboard.getCurrentUser().done(function (currentUser) { - if (currentUser.Configuration.IsAdministrator) { + if (currentUser.Policy.IsAdministrator) { Dashboard.showPackageInstallNotification(msg.Data, "failed"); Dashboard.refreshSystemInfoFromServer(); } @@ -910,7 +910,7 @@ var Dashboard = { else if (msg.MessageType === "PackageInstallationCancelled") { Dashboard.getCurrentUser().done(function (currentUser) { - if (currentUser.Configuration.IsAdministrator) { + if (currentUser.Policy.IsAdministrator) { Dashboard.showPackageInstallNotification(msg.Data, "cancelled"); Dashboard.refreshSystemInfoFromServer(); } @@ -919,7 +919,7 @@ var Dashboard = { else if (msg.MessageType === "PackageInstalling") { Dashboard.getCurrentUser().done(function (currentUser) { - if (currentUser.Configuration.IsAdministrator) { + if (currentUser.Policy.IsAdministrator) { Dashboard.showPackageInstallNotification(msg.Data, "progress"); Dashboard.refreshSystemInfoFromServer(); } @@ -1436,7 +1436,7 @@ $(document).on('pagebeforeshow', ".page", function () { var isSettingsPage = page.hasClass('type-interior'); - if (!user.Configuration.IsAdministrator && isSettingsPage) { + if (!user.Policy.IsAdministrator && isSettingsPage) { window.location.replace("index.html"); return; } diff --git a/dashboard-ui/scripts/useredit.js b/dashboard-ui/scripts/useredit.js index c1c078c06b..21e016eb51 100644 --- a/dashboard-ui/scripts/useredit.js +++ b/dashboard-ui/scripts/useredit.js @@ -21,20 +21,19 @@ $('#txtUserName', page).val(user.Name); $('#txtConnectUserName', page).val(currentUser.ConnectUserName); - $('#chkIsAdmin', page).checked(user.Configuration.IsAdministrator || false).checkboxradio("refresh"); - $('#chkBlockNotRated', page).checked(user.Configuration.BlockNotRated || false).checkboxradio("refresh"); + $('#chkIsAdmin', page).checked(user.Policy.IsAdministrator || false).checkboxradio("refresh"); - $('#chkDisabled', page).checked(user.Configuration.IsDisabled || false).checkboxradio("refresh"); - $('#chkIsHidden', page).checked(user.Configuration.IsHidden || false).checkboxradio("refresh"); - $('#chkRemoteControlSharedDevices', page).checked(user.Configuration.EnableSharedDeviceControl); - $('#chkEnableRemoteControlOtherUsers', page).checked(user.Configuration.EnableRemoteControlOfOtherUsers).checkboxradio("refresh"); - $('#chkEnableMediaPlayback', page).checked(user.Configuration.EnableMediaPlayback || false).checkboxradio("refresh"); + $('#chkDisabled', page).checked(user.Policy.IsDisabled || false).checkboxradio("refresh"); + $('#chkIsHidden', page).checked(user.Policy.IsHidden || false).checkboxradio("refresh"); + $('#chkRemoteControlSharedDevices', page).checked(user.Policy.EnableSharedDeviceControl); + $('#chkEnableRemoteControlOtherUsers', page).checked(user.Policy.EnableRemoteControlOfOtherUsers).checkboxradio("refresh"); + $('#chkEnableMediaPlayback', page).checked(user.Policy.EnableMediaPlayback || false).checkboxradio("refresh"); - $('#chkManageLiveTv', page).checked(user.Configuration.EnableLiveTvManagement || false).checkboxradio("refresh"); - $('#chkEnableLiveTvAccess', page).checked(user.Configuration.EnableLiveTvAccess || false).checkboxradio("refresh"); - $('#chkEnableContentDeletion', page).checked(user.Configuration.EnableContentDeletion || false).checkboxradio("refresh"); + $('#chkManageLiveTv', page).checked(user.Policy.EnableLiveTvManagement || false).checkboxradio("refresh"); + $('#chkEnableLiveTvAccess', page).checked(user.Policy.EnableLiveTvAccess || false).checkboxradio("refresh"); + $('#chkEnableContentDeletion', page).checked(user.Policy.EnableContentDeletion || false).checkboxradio("refresh"); - $('#chkDisableUserPreferences', page).checked((!user.Configuration.EnableUserPreferenceAccess) || false).checkboxradio("refresh"); + $('#chkDisableUserPreferences', page).checked((!user.Policy.EnableUserPreferenceAccess) || false).checkboxradio("refresh"); $('#chkEnableSync', page).checked(user.Policy.EnableSync).checkboxradio("refresh"); @@ -63,19 +62,17 @@ user.Name = $('#txtUserName', page).val(); - user.Configuration.IsAdministrator = $('#chkIsAdmin', page).checked(); + user.Policy.IsAdministrator = $('#chkIsAdmin', page).checked(); - user.Configuration.BlockNotRated = $('#chkBlockNotRated', page).checked(); - - user.Configuration.IsHidden = $('#chkIsHidden', page).checked(); - user.Configuration.IsDisabled = $('#chkDisabled', page).checked(); - user.Configuration.EnableRemoteControlOfOtherUsers = $('#chkEnableRemoteControlOtherUsers', page).checked(); - user.Configuration.EnableLiveTvManagement = $('#chkManageLiveTv', page).checked(); - user.Configuration.EnableMediaPlayback = $('#chkEnableMediaPlayback', page).checked(); - user.Configuration.EnableLiveTvAccess = $('#chkEnableLiveTvAccess', page).checked(); - user.Configuration.EnableContentDeletion = $('#chkEnableContentDeletion', page).checked(); - user.Configuration.EnableUserPreferenceAccess = !$('#chkDisableUserPreferences', page).checked(); - user.Configuration.EnableSharedDeviceControl = $('#chkRemoteControlSharedDevices', page).checked(); + user.Policy.IsHidden = $('#chkIsHidden', page).checked(); + user.Policy.IsDisabled = $('#chkDisabled', page).checked(); + user.Policy.EnableRemoteControlOfOtherUsers = $('#chkEnableRemoteControlOtherUsers', page).checked(); + user.Policy.EnableLiveTvManagement = $('#chkManageLiveTv', page).checked(); + user.Policy.EnableMediaPlayback = $('#chkEnableMediaPlayback', page).checked(); + user.Policy.EnableLiveTvAccess = $('#chkEnableLiveTvAccess', page).checked(); + user.Policy.EnableContentDeletion = $('#chkEnableContentDeletion', page).checked(); + user.Policy.EnableUserPreferenceAccess = !$('#chkDisableUserPreferences', page).checked(); + user.Policy.EnableSharedDeviceControl = $('#chkRemoteControlSharedDevices', page).checked(); user.Policy.EnableSync = $('#chkEnableSync', page).checked(); diff --git a/dashboard-ui/scripts/userlibraryaccess.js b/dashboard-ui/scripts/userlibraryaccess.js index 812c656b2e..60b02a43d4 100644 --- a/dashboard-ui/scripts/userlibraryaccess.js +++ b/dashboard-ui/scripts/userlibraryaccess.js @@ -14,7 +14,7 @@ var id = 'mediaFolder' + i; - var checkedAttribute = user.Configuration.BlockedMediaFolders.indexOf(folder.Id) == -1 && user.Configuration.BlockedMediaFolders.indexOf(folder.Name) == -1 ? ' checked="checked"' : ''; + var checkedAttribute = user.Policy.BlockedMediaFolders.indexOf(folder.Id) == -1 && user.Policy.BlockedMediaFolders.indexOf(folder.Name) == -1 ? ' checked="checked"' : ''; html += ''; html += ''; @@ -39,7 +39,7 @@ var id = 'channels' + i; - var checkedAttribute = user.Configuration.BlockedChannels.indexOf(folder.Id) == -1 ? ' checked="checked"' : ''; + var checkedAttribute = user.Policy.BlockedChannels.indexOf(folder.Id) == -1 ? ' checked="checked"' : ''; html += ''; html += ''; @@ -77,19 +77,19 @@ function saveUser(user, page) { - user.Configuration.BlockedMediaFolders = $('.chkMediaFolder:not(:checked)', page).map(function () { + user.Policy.BlockedMediaFolders = $('.chkMediaFolder:not(:checked)', page).map(function () { return this.getAttribute('data-foldername'); }).get(); - user.Configuration.BlockedChannels = $('.chkChannel:not(:checked)', page).map(function () { + user.Policy.BlockedChannels = $('.chkChannel:not(:checked)', page).map(function () { return this.getAttribute('data-foldername'); }).get(); - ApiClient.updateUserConfiguration(user.Id, user.Configuration).done(function () { + ApiClient.updateUserPolicy(user.Id, user.Policy).done(function () { onSaveComplete(page); }); } diff --git a/dashboard-ui/scripts/usernew.js b/dashboard-ui/scripts/usernew.js index e7cfdda226..318714e9f8 100644 --- a/dashboard-ui/scripts/usernew.js +++ b/dashboard-ui/scripts/usernew.js @@ -14,7 +14,7 @@ var id = 'mediaFolder' + i; - var checkedAttribute = user.Configuration.BlockedMediaFolders.indexOf(folder.Id) == -1 && user.Configuration.BlockedMediaFolders.indexOf(folder.Name) == -1 ? ' checked="checked"' : ''; + var checkedAttribute = user.Policy.BlockedMediaFolders.indexOf(folder.Id) == -1 && user.Policy.BlockedMediaFolders.indexOf(folder.Name) == -1 ? ' checked="checked"' : ''; html += ''; html += ''; @@ -39,7 +39,7 @@ var id = 'channels' + i; - var checkedAttribute = user.Configuration.BlockedChannels.indexOf(folder.Id) == -1 ? ' checked="checked"' : ''; + var checkedAttribute = user.Policy.BlockedChannels.indexOf(folder.Id) == -1 ? ' checked="checked"' : ''; html += ''; html += ''; @@ -81,19 +81,19 @@ ApiClient.createUser(name).done(function (user) { - user.Configuration.BlockedMediaFolders = $('.chkMediaFolder:not(:checked)', page).map(function () { + user.Policy.BlockedMediaFolders = $('.chkMediaFolder:not(:checked)', page).map(function () { return this.getAttribute('data-foldername'); }).get(); - user.Configuration.BlockedChannels = $('.chkChannel:not(:checked)', page).map(function () { + user.Policy.BlockedChannels = $('.chkChannel:not(:checked)', page).map(function () { return this.getAttribute('data-foldername'); }).get(); - ApiClient.updateUserConfiguration(user.Id, user.Configuration).done(function () { + ApiClient.updateUserPolicy(user.Id, user.Policy).done(function () { Dashboard.navigate("useredit.html?userId=" + user.Id); }); }); diff --git a/dashboard-ui/scripts/userparentalcontrol.js b/dashboard-ui/scripts/userparentalcontrol.js index edb98bf45c..c12f854138 100644 --- a/dashboard-ui/scripts/userparentalcontrol.js +++ b/dashboard-ui/scripts/userparentalcontrol.js @@ -65,7 +65,7 @@ var id = 'unratedItem' + i; - var checkedAttribute = user.Configuration.BlockUnratedItems.indexOf(item.value) != -1 ? ' checked="checked"' : ''; + var checkedAttribute = user.Policy.BlockUnratedItems.indexOf(item.value) != -1 ? ' checked="checked"' : ''; html += ''; html += ''; @@ -81,19 +81,19 @@ Dashboard.setPageTitle(user.Name); loadUnratedItems(page, user); - loadTags(page, user.Configuration.BlockedTags); + loadTags(page, user.Policy.BlockedTags); populateRatings(allParentalRatings, page); var ratingValue = ""; - if (user.Configuration.MaxParentalRating) { + if (user.Policy.MaxParentalRating) { for (var i = 0, length = allParentalRatings.length; i < length; i++) { var rating = allParentalRatings[i]; - if (user.Configuration.MaxParentalRating >= rating.Value) { + if (user.Policy.MaxParentalRating >= rating.Value) { ratingValue = rating.Value; } } @@ -101,13 +101,13 @@ $('#selectMaxParentalRating', page).val(ratingValue).selectmenu("refresh"); - if (user.Configuration.IsAdministrator) { + if (user.Policy.IsAdministrator) { $('.accessScheduleSection', page).hide(); } else { $('.accessScheduleSection', page).show(); } - renderAccessSchedule(page, user.Configuration.AccessSchedules || []); + renderAccessSchedule(page, user.Policy.AccessSchedules || []); Dashboard.hideLoadingMsg(); } @@ -199,19 +199,19 @@ function saveUser(user, page) { - user.Configuration.MaxParentalRating = $('#selectMaxParentalRating', page).val() || null; + user.Policy.MaxParentalRating = $('#selectMaxParentalRating', page).val() || null; - user.Configuration.BlockUnratedItems = $('.chkUnratedItem:checked', page).map(function () { + user.Policy.BlockUnratedItems = $('.chkUnratedItem:checked', page).map(function () { return this.getAttribute('data-itemtype'); }).get(); - user.Configuration.AccessSchedules = getSchedulesFromPage(page); + user.Policy.AccessSchedules = getSchedulesFromPage(page); - user.Configuration.BlockedTags = getTagsFromPage(page); + user.Policy.BlockedTags = getTagsFromPage(page); - ApiClient.updateUserConfiguration(user.Id, user.Configuration).done(function () { + ApiClient.updateUserPolicy(user.Id, user.Policy).done(function () { onSaveComplete(page); }); } diff --git a/dashboard-ui/scripts/userprofilespage.js b/dashboard-ui/scripts/userprofilespage.js index a32f8d4e3e..23b63bcac3 100644 --- a/dashboard-ui/scripts/userprofilespage.js +++ b/dashboard-ui/scripts/userprofilespage.js @@ -94,7 +94,7 @@ var cssClass = "card squareCard alternateHover bottomPaddedCard"; - if (user.Configuration.IsDisabled) { + if (user.Policy.IsDisabled) { cssClass += ' grayscale'; } diff --git a/dashboard-ui/thirdparty/apiclient/connectionmanager.js b/dashboard-ui/thirdparty/apiclient/connectionmanager.js index cad25d9c7e..9f3c64f6dd 100644 --- a/dashboard-ui/thirdparty/apiclient/connectionmanager.js +++ b/dashboard-ui/thirdparty/apiclient/connectionmanager.js @@ -375,7 +375,7 @@ { localUser: localUser, name: connectUser ? connectUser.Name : localUser.Name, - canManageServer: localUser && localUser.Configuration.IsAdministrator, + canManageServer: localUser && localUser.Policy.IsAdministrator, imageUrl: image.url, supportsImageParams: image.supportsParams }]); diff --git a/dashboard-ui/wizardlibrary.html b/dashboard-ui/wizardlibrary.html index de88c7d10f..4316e7f001 100644 --- a/dashboard-ui/wizardlibrary.html +++ b/dashboard-ui/wizardlibrary.html @@ -28,12 +28,11 @@

- +
- ${MediaFolderHelpPluginRequired}