lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update queries

Browse Source
This commit is contained in:
Luke Pulverenti 2015-11-16 17:03:11 -05:00
parent 79b2415fdf
commit 51d00cf3fd
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
MediaBrowser.Controller/Entities/UserView.cs
View File

@ -132,11 +132,6 @@ namespace MediaBrowser.Controller.Entities
CollectionType.Playlists CollectionType.Playlists
}; };
if (!ConfigurationManager.Configuration.EnableSharedCollectionViewImage)
{
standaloneTypes.Add(CollectionType.BoxSets);
}
var collectionFolder = folder as ICollectionFolder; var collectionFolder = folder as ICollectionFolder;
if (collectionFolder == null) if (collectionFolder == null)
@ -172,7 +167,9 @@ namespace MediaBrowser.Controller.Entities
CollectionType.Books, CollectionType.Books,
CollectionType.MusicVideos, CollectionType.MusicVideos,
CollectionType.HomeVideos, CollectionType.HomeVideos,
CollectionType.Photos CollectionType.Photos,
CollectionType.Music,
CollectionType.BoxSets
}; };
return types.Contains(viewType ?? string.Empty, StringComparer.OrdinalIgnoreCase); return types.Contains(viewType ?? string.Empty, StringComparer.OrdinalIgnoreCase);

4
MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
View File

@ -1954,14 +1954,14 @@ namespace MediaBrowser.Server.Implementations.Persistence
if (query.TopParentIds.Length == 1) if (query.TopParentIds.Length == 1)
{ {
whereClauses.Add("(TopParentId is null or TopParentId=@TopParentId)"); whereClauses.Add("(TopParentId=@TopParentId)");
cmd.Parameters.Add(cmd, "@TopParentId", DbType.String).Value = query.TopParentIds[0]; cmd.Parameters.Add(cmd, "@TopParentId", DbType.String).Value = query.TopParentIds[0];
} }
if (query.TopParentIds.Length > 1) if (query.TopParentIds.Length > 1)
{ {
var val = string.Join(",", query.TopParentIds.Select(i => "'" + i + "'").ToArray()); var val = string.Join(",", query.TopParentIds.Select(i => "'" + i + "'").ToArray());
whereClauses.Add("(TopParentId is null or TopParentId in (" + val + "))"); whereClauses.Add("(TopParentId in (" + val + "))");
} }
if (query.AncestorIds.Length == 1) if (query.AncestorIds.Length == 1)

4
SharedVersion.cs
View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
//[assembly: AssemblyVersion("3.0.*")] [assembly: AssemblyVersion("3.0.*")]
[assembly: AssemblyVersion("3.0.5781.2")] //[assembly: AssemblyVersion("3.0.5781.2")]