diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs index 75bddda723..9e75591fb4 100644 --- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs +++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs @@ -128,6 +128,7 @@ public BaseItemDto GetBaseItemDto(BaseItem item, DtoOptions options, User user = SetItemByNameInfo(item, dto, libraryItems.ToList(), user); + FillSyncInfo(dto, item, options); return dto; } @@ -307,6 +308,7 @@ public BaseItemDto GetItemByNameDto(T item, DtoOptions options, List @@ -433,6 +434,11 @@ private string GetSyncProviderId(ISyncProvider provider) public bool SupportsSync(BaseItem item) { + if (item is Playlist) + { + return true; + } + if (string.Equals(item.MediaType, MediaType.Video, StringComparison.OrdinalIgnoreCase) || string.Equals(item.MediaType, MediaType.Audio, StringComparison.OrdinalIgnoreCase) || string.Equals(item.MediaType, MediaType.Photo, StringComparison.OrdinalIgnoreCase) || @@ -461,7 +467,7 @@ public bool SupportsSync(BaseItem item) { return false; } - + if (video.IsPlaceHolder) { return false; diff --git a/MediaBrowser.WebDashboard/dashboard-ui/scripts/librarybrowser.js b/MediaBrowser.WebDashboard/dashboard-ui/scripts/librarybrowser.js index 07bdea04fc..268e63fe92 100644 --- a/MediaBrowser.WebDashboard/dashboard-ui/scripts/librarybrowser.js +++ b/MediaBrowser.WebDashboard/dashboard-ui/scripts/librarybrowser.js @@ -322,7 +322,7 @@ commands.push('refresh'); - if (SyncManager.isAvailable(item)) { + if (SyncManager.isAvailable(item, user)) { commands.push('sync'); } diff --git a/MediaBrowser.WebDashboard/dashboard-ui/scripts/playlists.js b/MediaBrowser.WebDashboard/dashboard-ui/scripts/playlists.js index 18602e0511..bec124c01f 100644 --- a/MediaBrowser.WebDashboard/dashboard-ui/scripts/playlists.js +++ b/MediaBrowser.WebDashboard/dashboard-ui/scripts/playlists.js @@ -9,7 +9,7 @@ SortOrder: "Ascending", IncludeItemTypes: "Playlist", Recursive: true, - Fields: "PrimaryImageAspectRatio,SortName,CumulativeRunTimeTicks,CanDelete", + Fields: "PrimaryImageAspectRatio,SortName,CumulativeRunTimeTicks,CanDelete,SyncInfo", StartIndex: 0 }; diff --git a/MediaBrowser.WebDashboard/dashboard-ui/scripts/site.js b/MediaBrowser.WebDashboard/dashboard-ui/scripts/site.js index ef4b363f32..020b5ad3b1 100644 --- a/MediaBrowser.WebDashboard/dashboard-ui/scripts/site.js +++ b/MediaBrowser.WebDashboard/dashboard-ui/scripts/site.js @@ -132,7 +132,7 @@ var Dashboard = { var urlLower = getWindowUrl().toLowerCase(); var index = urlLower.indexOf('/web'); if (index == -1) { - index = urlLower.index('/dashboard'); + index = urlLower.indexOf('/dashboard'); } if (index != -1) { diff --git a/MediaBrowser.WebDashboard/dashboard-ui/scripts/tvgenres.js b/MediaBrowser.WebDashboard/dashboard-ui/scripts/tvgenres.js index 24f709b024..b26e84bc5d 100644 --- a/MediaBrowser.WebDashboard/dashboard-ui/scripts/tvgenres.js +++ b/MediaBrowser.WebDashboard/dashboard-ui/scripts/tvgenres.js @@ -9,7 +9,7 @@ SortOrder: "Ascending", IncludeItemTypes: "Series", Recursive: true, - Fields: "DateCreated", + Fields: "DateCreated,SyncInfo", StartIndex: 0 }; diff --git a/SharedVersion.cs b/SharedVersion.cs index 658aa62a7e..11e0a10cfc 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5518.2")] +[assembly: AssemblyVersion("3.0.5518.3")]