Merge pull request #5 from episerver/language_filter_fix

In order to view content that has no language, the language filter is ch...
episerver · Jan 14, 2015 · ff51115 · ff51115
2 parents 7acb11d + 990b587
commit ff51115
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/PowerSlice/ContentSliceBase.cs b/PowerSlice/ContentSliceBase.cs
@@ -15,8 +15,8 @@
 
 namespace PowerSlice
 {
-    public abstract class ContentSliceBase<TContent> : ContentQueryBase, IContentSlice, ISortableContentSlice<TContent> 
-        where TContent : IContentData
+    public abstract class ContentSliceBase<TContent> : ContentQueryBase, IContentSlice, ISortableContentSlice<TContent>
+        where TContent : class, IContentData
     {
         protected IClient SearchClient;
         protected IContentTypeRepository ContentTypeRepository;
@@ -38,8 +38,7 @@ public override QueryRange<IContent> ExecuteQuery(IQueryParameters parameters)
         {
             var contentQueryParam = parameters as ContentQueryParameters;
 
-            var searchRequest = SearchClient.Search<TContent>()
-                .FilterOnLanguages(new[] { contentQueryParam.PreferredCulture.Name });
+            var searchRequest = SearchClient.Search<TContent>();
 
             var searchPhrase = parameters.AllParameters["q"];
             var hasFreeTextQuery = !string.IsNullOrWhiteSpace(searchPhrase) && searchPhrase != "*";
@@ -48,6 +47,8 @@ public override QueryRange<IContent> ExecuteQuery(IQueryParameters parameters)
                 searchRequest = ApplyTextSearch(searchRequest, searchPhrase);
             }
 
+            searchRequest = searchRequest.Filter(x => !x.MatchTypeHierarchy(typeof(ILocalizable)) | ((ILocalizable)x).Language.Name.Match(contentQueryParam.PreferredCulture.Name));
+
             searchRequest = Filter(searchRequest, contentQueryParam);
 
             searchRequest = ApplyVisibilityFilter(searchRequest);