Merge pull request #1010 from MediaBrowser/dev

3.0.5518.3
MediaBrowser · Feb 11, 2015 · c0ea228 · c0ea228
2 parents ef2a2ff + 179ff34
commit c0ea228
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 7 deletions.
diff --git 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>(T item, DtoOptions options, List<BaseItem
             var dto = GetBaseItemDtoInternal(item, options, user);
 
             SetItemByNameInfo(item, dto, taggedItems, user);
+            FillSyncInfo(dto, item, options);
 
             return dto;
         }

diff --git a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
@@ -12,6 +12,7 @@
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.MediaEncoding;
+using MediaBrowser.Controller.Playlists;
 using MediaBrowser.Controller.Sync;
 using MediaBrowser.Controller.TV;
 using MediaBrowser.Model.Dlna;
@@ -207,7 +208,7 @@ internal void OnSyncJobUpdated(SyncJob job)
         internal async Task UpdateSyncJobItemInternal(SyncJobItem jobItem)
         {
             await _repo.Update(jobItem).ConfigureAwait(false);
-            
+
             if (SyncJobUpdated != null)
             {
                 EventHelper.FireEventIfNotNull(SyncJobItemUpdated, this, new GenericEventArgs<SyncJobItem>
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
 using System.Reflection;
 
 //[assembly: AssemblyVersion("3.0.*")]
-[assembly: AssemblyVersion("3.0.5518.2")]
+[assembly: AssemblyVersion("3.0.5518.3")]