Merge branch 'master' of github.com:kilrogg/django-wiki into kilrogg-master

Conflicts:
	wiki/plugins/haystack/views.py

wiki/plugins/haystack/views.py

 from __future__ import absolute_import
 from __future__ import unicode_literals
+from haystack.backends import SQ
 from wiki.views.article import SearchView
 from haystack.query import SearchQuerySet
 from haystack.inputs import AutoQuery
 from wiki.core import permissions
 from wiki import models
 
+
 class HaystackSearchView(SearchView):
     
     template_name = 'wiki/plugins/haystack/search.html'
@@ -13,20 +15,18 @@ class HaystackSearchView(SearchView):
     def get_queryset(self):
         qs = SearchQuerySet().all()
         if self.request.user.is_authenticated():
-            # TODO: This has a leak! It should say:
-            # group=self.request.group.id AND group_read=True
-            if not permissions.can_moderate(models.URLPath.root().article, 
-                self.request.user):
-                qs = qs.filter_or(
-                    owner=self.request.user.id, 
-                    group=self.request.group.id,
-                    other_read=True
+            if not permissions.can_moderate(models.URLPath.root().article, self.request.user):
+                qs = qs.filter(
+                    SQ(owner_id=self.request.user.id) |
+                    (
+                        SQ(group_id__in=self.request.user.groups.values_list('id', flat=True))
+                        & SQ(group_read=True)
+                    ) |
+                    SQ(other_read=True)
                 )
         else:
             qs = qs.exclude(other_read=False)
         
         qs = qs.filter(content=AutoQuery(self.query))
-        qs = qs.exclude(other_read=False)
         qs = qs.load_all()
         return qs
-    
\ No newline at end of file

wiki/plugins/notifications/forms.py

@@ -39,7 +39,7 @@ class SettingsModelForm(forms.ModelForm):
         if instance:
             self.__editing_instance = True
             self.fields['delete_subscriptions'] = ArticleSubscriptionModelMultipleChoiceField(
-                models.ArticleSubscription.objects.filter(settings=instance),
+                models.ArticleSubscription.objects.filter(subscription__settings=instance),
                 label=_("Remove subscriptions"),
                 required=False,
                 help_text=_("Select article subscriptions to remove from notifications"),

wiki/plugins/notifications/views.py

@@ -24,7 +24,7 @@ class NotificationSettings(FormView):
             settings = form.save()
             from . import models
             article_subscriptions = models.ArticleSubscription.objects.filter(
-                settings = form.instance,
+                subscription_settings = form.instance,
                 article__current_revision__deleted=False,
             ).select_related('article', 'article__current_revision')
             messages.info(
@@ -51,7 +51,7 @@ class NotificationSettings(FormView):
             if form.instance:
                 setattr(form.instance, 'articlesubscriptions', 
                     models.ArticleSubscription.objects.filter(
-                        settings = form.instance,
+                        subscription__settings = form.instance,
                         article__current_revision__deleted=False,
                     ).select_related('article', 'article__current_revision')
                 )