diff options
| author | Rich Lander <rlander@microsoft.com> | 2021-07-26 13:08:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-26 13:08:27 -0700 |
| commit | 3e0aab390aea4e934e60c4b60caee802cfe706d8 (patch) | |
| tree | a0d36f12a50724ac4531ac7af76058c996a5e3c7 /MediaBrowser.Controller/Channels/Channel.cs | |
| parent | 0ce7a15534461d70730ac8d1accfda1d45b01b55 (diff) | |
| parent | 85e705d09efbda1630b419fab3a0065046b8de6d (diff) | |
Merge branch 'master' into mediabrowser-controller-entities
Diffstat (limited to 'MediaBrowser.Controller/Channels/Channel.cs')
| -rw-r--r-- | MediaBrowser.Controller/Channels/Channel.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/MediaBrowser.Controller/Channels/Channel.cs b/MediaBrowser.Controller/Channels/Channel.cs index 26a936be0..e6923b55c 100644 --- a/MediaBrowser.Controller/Channels/Channel.cs +++ b/MediaBrowser.Controller/Channels/Channel.cs @@ -17,6 +17,12 @@ namespace MediaBrowser.Controller.Channels { public class Channel : Folder { + [JsonIgnore] + public override bool SupportsInheritedParentImages => false; + + [JsonIgnore] + public override SourceType SourceType => SourceType.Channel; + public override bool IsVisible(User user) { var blockedChannelsPreference = user.GetPreferenceValues<Guid>(PreferenceKind.BlockedChannels); @@ -39,12 +45,6 @@ namespace MediaBrowser.Controller.Channels return base.IsVisible(user); } - [JsonIgnore] - public override bool SupportsInheritedParentImages => false; - - [JsonIgnore] - public override SourceType SourceType => SourceType.Channel; - protected override QueryResult<BaseItem> GetItemsInternal(InternalItemsQuery query) { try |
