diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-06-07 17:06:01 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-06-07 17:06:01 -0400 |
| commit | 4f0e6f61e7f5d319a47d78e535d7e2d77ed1e729 (patch) | |
| tree | bed0100b1f1de03678e410d2be89a6571a9411fe /MediaBrowser.Server.Implementations | |
| parent | e210825e54d2199028570489ee4f3d2834676021 (diff) | |
add adult content filter to catalog
Diffstat (limited to 'MediaBrowser.Server.Implementations')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Channels/ChannelManager.cs | 7 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Localization/Server/server.json | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs index 0ddef73c5..69a681ead 100644 --- a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs +++ b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs @@ -797,12 +797,7 @@ namespace MediaBrowser.Server.Implementations.Channels await RefreshIfNeeded(all, cancellationToken).ConfigureAwait(false); - // Get everything - var fields = Enum.GetNames(typeof(ItemFields)) - .Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true)) - .ToList(); - - var returnItemArray = all.Select(i => _dtoService.GetBaseItemDto(i, fields, user)) + var returnItemArray = all.Select(i => _dtoService.GetBaseItemDto(i, query.Fields, user)) .ToArray(); return new QueryResult<BaseItemDto> diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json index 23ea3f91e..b886d4f6b 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/server.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json @@ -823,5 +823,6 @@ "HeaderOtherDisplaySettings": "Display Settings", "HeaderLibraryViews": "Library Views", "LabelSelectFolderGroups": "Automatically group content from the following folders into views such as Movies, Music and TV:", - "LabelSelectFolderGroupsHelp": "Folders that are unchecked will be displayed by themselves in their own view." + "LabelSelectFolderGroupsHelp": "Folders that are unchecked will be displayed by themselves in their own view.", + "OptionDisplayAdultContent": "Display adult content" }
\ No newline at end of file |