From 4986722c7305ebce02c37c80363a909d372ff7a3 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 5 Apr 2013 15:02:48 -0400
Subject: made display preferences uniquely identifiable

---
 MediaBrowser.Controller/Library/DtoBuilder.cs   | 2 +-
 MediaBrowser.Controller/Library/IUserManager.cs | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'MediaBrowser.Controller/Library')

diff --git a/MediaBrowser.Controller/Library/DtoBuilder.cs b/MediaBrowser.Controller/Library/DtoBuilder.cs
index fbaa59f34f..d54563e41b 100644
--- a/MediaBrowser.Controller/Library/DtoBuilder.cs
+++ b/MediaBrowser.Controller/Library/DtoBuilder.cs
@@ -174,7 +174,7 @@ namespace MediaBrowser.Controller.Library
 
             if (item.IsFolder && fields.Contains(ItemFields.DisplayPreferencesId))
             {
-                dto.DisplayPreferencesId = ((Folder)item).DisplayPreferencesId.ToString();
+                dto.DisplayPreferencesId = ((Folder) item).GetDisplayPreferencesId(user.Id).ToString();
             }
 
             if (item.IsFolder)
diff --git a/MediaBrowser.Controller/Library/IUserManager.cs b/MediaBrowser.Controller/Library/IUserManager.cs
index 8eee8e447c..1c276ffebd 100644
--- a/MediaBrowser.Controller/Library/IUserManager.cs
+++ b/MediaBrowser.Controller/Library/IUserManager.cs
@@ -190,23 +190,20 @@ namespace MediaBrowser.Controller.Library
         /// <param name="userDataId">The user data id.</param>
         /// <returns>Task{DisplayPreferences}.</returns>
         Task<UserItemData> GetUserData(Guid userId, Guid userDataId);
-        
+
         /// <summary>
         /// Gets the display preferences.
         /// </summary>
-        /// <param name="userId">The user id.</param>
         /// <param name="displayPreferencesId">The display preferences id.</param>
         /// <returns>DisplayPreferences.</returns>
-        Task<DisplayPreferences> GetDisplayPreferences(Guid userId, Guid displayPreferencesId);
+        Task<DisplayPreferences> GetDisplayPreferences(Guid displayPreferencesId);
 
         /// <summary>
         /// Saves display preferences for an item
         /// </summary>
-        /// <param name="userId">The user id.</param>
-        /// <param name="displayPreferencesId">The display preferences id.</param>
         /// <param name="displayPreferences">The display preferences.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        Task SaveDisplayPreferences(Guid userId, Guid displayPreferencesId, DisplayPreferences displayPreferences, CancellationToken cancellationToken);
+        Task SaveDisplayPreferences(DisplayPreferences displayPreferences, CancellationToken cancellationToken);
     }
 }
-- 
cgit v1.2.3