Merge branch 'master' into feat/book-persons

1 files changed, 11 insertions, 0 deletions

diff --git a/MediaBrowser.Model/Users/UserPolicy.cs b/MediaBrowser.Model/Users/UserPolicy.cs
index 8354c60ef..219ed5d5f 100644
--- a/MediaBrowser.Model/Users/UserPolicy.cs
+++ b/MediaBrowser.Model/Users/UserPolicy.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
 using System.Xml.Serialization;
 using Jellyfin.Data.Enums;
 using AccessSchedule = Jellyfin.Data.Entities.AccessSchedule;
@@ -15,6 +16,7 @@ namespace MediaBrowser.Model.Users
         {
             IsHidden = true;
             EnableCollectionManagement = false;
+            EnableSubtitleManagement = false;
 
             EnableContentDeletion = false;
             EnableContentDeletionFromFolders = Array.Empty<string>();
@@ -84,6 +86,13 @@ namespace MediaBrowser.Model.Users
         public bool EnableCollectionManagement { get; set; }
 
         /// <summary>
+        /// Gets or sets a value indicating whether this instance can manage subtitles.
+        /// </summary>
+        /// <value><c>true</c> if this instance is allowed; otherwise, <c>false</c>.</value>
+        [DefaultValue(false)]
+        public bool EnableSubtitleManagement { get; set; }
+
+        /// <summary>
         /// Gets or sets a value indicating whether this instance is disabled.
         /// </summary>
         /// <value><c>true</c> if this instance is disabled; otherwise, <c>false</c>.</value>
@@ -166,8 +175,10 @@ namespace MediaBrowser.Model.Users
         public int RemoteClientBitrateLimit { get; set; }
 
         [XmlElement(ElementName = "AuthenticationProviderId")]
+        [Required(AllowEmptyStrings = false)]
         public string AuthenticationProviderId { get; set; }
 
+        [Required(AllowEmptyStrings= false)]
         public string PasswordResetProviderId { get; set; }
 
         /// <summary>