michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

#182 - Eliminate duplicates in the selection list for max rating in user screen

Browse Source
This commit is contained in:
Luke Pulverenti 2013-04-22 11:38:38 -04:00
parent a55999b780
commit 47d2a11bdf
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@ -849,10 +849,15 @@ namespace MediaBrowser.Controller.Entities
{ {
if (user == null) if (user == null)
{ {
throw new ArgumentNullException(); throw new ArgumentNullException("user");
} }
return user.Configuration.MaxParentalRating == null || Ratings.Level(CustomRating ?? OfficialRating) <= user.Configuration.MaxParentalRating; if (string.IsNullOrEmpty(user.Configuration.MaxParentalRating))
{
return true;
}
return Ratings.Level(CustomRating ?? OfficialRating) <= Ratings.Level(user.Configuration.MaxParentalRating);
} }
/// <summary> /// <summary>

3
MediaBrowser.Controller/Localization/Ratings.cs
View File

@ -1,4 +1,5 @@
using MediaBrowser.Controller.Configuration; using System.Globalization;
using MediaBrowser.Controller.Configuration;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;

2
MediaBrowser.Model/Configuration/UserConfiguration.cs
View File

@ -10,7 +10,7 @@ namespace MediaBrowser.Model.Configuration
/// Gets or sets the max parental rating. /// Gets or sets the max parental rating.
/// </summary> /// </summary>
/// <value>The max parental rating.</value> /// <value>The max parental rating.</value>
public int? MaxParentalRating { get; set; } public string MaxParentalRating { get; set; }
/// <summary> /// <summary>
/// Gets or sets a value indicating whether [use custom library]. /// Gets or sets a value indicating whether [use custom library].