Merge branch 'master' of github.com:coleifer/django-relationships

Author: coleifer

relationships/models.py

@@ -117,6 +117,16 @@ def get_symmetrical(self, status):
             from_users__to_user=self.instance,
             from_users__site__pk=settings.SITE_ID)
 
+    def only_to(self, status):
+        from_relationships = self.get_relationships(status)
+        to_relationships = self.get_related_to(status)
+        return to_relationships.exclude(pk__in=from_relationships.values_list('pk'))
+    
+    def only_from(self, status):
+        from_relationships = self.get_relationships(status)
+        to_relationships = self.get_related_to(status)
+        return from_relationships.exclude(pk__in=to_relationships.values_list('pk'))
+    
     def exists(self, user, status=None):
         query = {'to_users__from_user': self.instance,
                  'to_users__to_user': user,

relationships/tests/tests.py

@@ -192,6 +192,13 @@ def test_custom_methods(self):
         self.assertTrue(self.yoko.relationships.symmetrical_exists(self.john, 1))
         self.assertFalse(self.yoko.relationships.symmetrical_exists(self.paul, 1))
         self.assertFalse(self.yoko.relationships.symmetrical_exists(self.walrus, 1))
+
+    def test_oneway_methods(self):
+        self.assertQuerysetEqual(self.john.relationships.only_from(self.following), [self.paul])
+        self.assertQuerysetEqual(self.john.relationships.only_to(self.following), [])
+        
+        self.assertQuerysetEqual(self.john.relationships.only_from(self.blocking), [])
+        self.assertQuerysetEqual(self.john.relationships.only_to(self.blocking), [self.paul])
 
     def test_site_behavior(self):
         # relationships are site-dependent

relationships/views.py

@@ -17,24 +17,22 @@
 def relationship_redirect(request):
     return HttpResponseRedirect(reverse('relationship_list', args=[request.user.username]))
 
-def _relationship_list(request, queryset, *args, **kwargs):
+def _relationship_list(request, queryset, template_name=None, *args, **kwargs):
     return object_list(
         request=request,
         queryset=queryset,
         paginate_by=20,
         page=int(request.GET.get('page', 0)),
         template_object_name='relationship',
-        template_name='relationships/relationship_list.html',
+        template_name=template_name,
         *args,
         **kwargs)
 
 @require_user
-def relationship_list(request, user, status_slug=None):
+def relationship_list(request, user, status_slug=None,
+                      template_name='relationships/relationship_list.html'):
     if not status_slug:
-        return _relationship_list(
-            request,
-            user.relationships.following(),
-            extra_context={'from_user': user})
+        status_slug = RelationshipStatus.objects.following().from_slug
 
     # get the relationship status object we're talking about
     try:
@@ -57,7 +55,7 @@ def relationship_list(request, user, status_slug=None):
         qs = user.relationships.get_related_to(status=status)
     else:
         qs = user.relationships.get_symmetrical(status=status)
-    return _relationship_list(request, qs, extra_context={
+    return _relationship_list(request, qs, template_name, extra_context={
         'from_user': user, 'status': status, 'status_slug': status_slug})
 
 @login_required