diff options
| -rw-r--r-- | MediaBrowser.Model/ApiClient/ServerCredentials.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Model/ApiClient/ServerInfo.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dto/BaseItemDto.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Dto/DtoService.cs | 2 |
4 files changed, 14 insertions, 0 deletions
diff --git a/MediaBrowser.Model/ApiClient/ServerCredentials.cs b/MediaBrowser.Model/ApiClient/ServerCredentials.cs index b5a1a7b49..f9af0fa4e 100644 --- a/MediaBrowser.Model/ApiClient/ServerCredentials.cs +++ b/MediaBrowser.Model/ApiClient/ServerCredentials.cs @@ -42,6 +42,11 @@ namespace MediaBrowser.Model.ApiClient existing.DateLastAccessed = server.DateLastAccessed; } + if (server.DateLastLocalConnection > existing.DateLastLocalConnection) + { + existing.DateLastLocalConnection = server.DateLastLocalConnection; + } + existing.UserLinkType = server.UserLinkType; if (!string.IsNullOrEmpty(server.AccessToken)) diff --git a/MediaBrowser.Model/ApiClient/ServerInfo.cs b/MediaBrowser.Model/ApiClient/ServerInfo.cs index e1fa581d7..53ae5be52 100644 --- a/MediaBrowser.Model/ApiClient/ServerInfo.cs +++ b/MediaBrowser.Model/ApiClient/ServerInfo.cs @@ -19,6 +19,7 @@ namespace MediaBrowser.Model.ApiClient public String AccessToken { get; set; } public List<WakeOnLanInfo> WakeOnLanInfos { get; set; } public DateTime DateLastAccessed { get; set; } + public DateTime DateLastLocalConnection { get; set; } public String ExchangeToken { get; set; } public UserLinkType? UserLinkType { get; set; } public ConnectionMode? LastConnectionMode { get; set; } diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs index 91beba726..935d280cd 100644 --- a/MediaBrowser.Model/Dto/BaseItemDto.cs +++ b/MediaBrowser.Model/Dto/BaseItemDto.cs @@ -555,6 +555,12 @@ namespace MediaBrowser.Model.Dto public string CollectionType { get; set; } /// <summary> + /// Gets or sets the type of the original collection. + /// </summary> + /// <value>The type of the original collection.</value> + public string OriginalCollectionType { get; set; } + + /// <summary> /// Gets or sets the display order. /// </summary> /// <value>The display order.</value> diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs index 86857b296..ccca6414a 100644 --- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs +++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs @@ -356,6 +356,8 @@ namespace MediaBrowser.Server.Implementations.Dto var collectionFolder = item as ICollectionFolder; if (collectionFolder != null) { + dto.OriginalCollectionType = collectionFolder.CollectionType; + dto.CollectionType = user == null ? collectionFolder.CollectionType : collectionFolder.GetViewType(user); |