diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-12-16 00:01:57 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-12-16 00:01:57 -0500 |
| commit | 3c48def0d76417572193cd306846f1516e0e9038 (patch) | |
| tree | 8570bb756e024eaca9f2d5b8008e43279aa9fb23 /MediaBrowser.Controller | |
| parent | 7f7d2f85e324bc9e2c6b170c89af0541601e8cad (diff) | |
sync updates
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Entities/User.cs | 25 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Library/IUserManager.cs | 4 |
2 files changed, 26 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/Entities/User.cs b/MediaBrowser.Controller/Entities/User.cs index 3fa0a04356..3dfc8cc7d7 100644 --- a/MediaBrowser.Controller/Entities/User.cs +++ b/MediaBrowser.Controller/Entities/User.cs @@ -140,6 +140,29 @@ namespace MediaBrowser.Controller.Entities } } + private UserPolicy _policy; + private readonly object _policySyncLock = new object(); + [IgnoreDataMember] + public UserPolicy Policy + { + get + { + if (_policy == null) + { + lock (_policySyncLock) + { + if (_policy == null) + { + _policy = UserManager.GetUserPolicy(this); + } + } + } + + return _policy; + } + set { _policy = value; } + } + /// <summary> /// Renames the user. /// </summary> @@ -200,7 +223,7 @@ namespace MediaBrowser.Controller.Entities /// </summary> /// <value>The configuration directory path.</value> [IgnoreDataMember] - private string ConfigurationDirectoryPath + public string ConfigurationDirectoryPath { get { diff --git a/MediaBrowser.Controller/Library/IUserManager.cs b/MediaBrowser.Controller/Library/IUserManager.cs index debdafe4d5..9dc16ba4d2 100644 --- a/MediaBrowser.Controller/Library/IUserManager.cs +++ b/MediaBrowser.Controller/Library/IUserManager.cs @@ -168,9 +168,9 @@ namespace MediaBrowser.Controller.Library /// <summary> /// Gets the user policy. /// </summary> - /// <param name="userId">The user identifier.</param> + /// <param name="user">The user.</param> /// <returns>UserPolicy.</returns> - UserPolicy GetUserPolicy(string userId); + UserPolicy GetUserPolicy(User user); /// <summary> /// Updates the user policy. |