diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-04-22 11:38:38 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-04-22 11:38:38 -0400 |
| commit | 47d2a11bdf9ea49c64ab8c49d2644d02b7747369 (patch) | |
| tree | b3ab3656bc476db01230cac9ebf380ca64c5e8cc | |
| parent | a55999b780367dfa344bb0dfc754b5172b0b195a (diff) | |
#182 - Eliminate duplicates in the selection list for max rating in user screen
| -rw-r--r-- | MediaBrowser.Controller/Entities/BaseItem.cs | 9 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Localization/Ratings.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Model/Configuration/UserConfiguration.cs | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index 1d803ea45..b4765759c 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -849,10 +849,15 @@ namespace MediaBrowser.Controller.Entities { if (user == null) { - throw new ArgumentNullException(); + throw new ArgumentNullException("user"); + } + + if (string.IsNullOrEmpty(user.Configuration.MaxParentalRating)) + { + return true; } - return user.Configuration.MaxParentalRating == null || Ratings.Level(CustomRating ?? OfficialRating) <= user.Configuration.MaxParentalRating; + return Ratings.Level(CustomRating ?? OfficialRating) <= Ratings.Level(user.Configuration.MaxParentalRating); } /// <summary> diff --git a/MediaBrowser.Controller/Localization/Ratings.cs b/MediaBrowser.Controller/Localization/Ratings.cs index 44bbb3d00..bc4ebab4e 100644 --- a/MediaBrowser.Controller/Localization/Ratings.cs +++ b/MediaBrowser.Controller/Localization/Ratings.cs @@ -1,4 +1,5 @@ -using MediaBrowser.Controller.Configuration; +using System.Globalization; +using MediaBrowser.Controller.Configuration; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs index deb6fdb3d..be784d1c6 100644 --- a/MediaBrowser.Model/Configuration/UserConfiguration.cs +++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs @@ -10,7 +10,7 @@ namespace MediaBrowser.Model.Configuration /// Gets or sets the max parental rating. /// </summary> /// <value>The max parental rating.</value> - public int? MaxParentalRating { get; set; } + public string MaxParentalRating { get; set; } /// <summary> /// Gets or sets a value indicating whether [use custom library]. |