Fix #191 - introduce DRY in plugins.notifications default_url

wiki/models/article.py

@@ -193,7 +193,7 @@ class ArticleForObject(models.Model):
                                        verbose_name=_('content type'),
                                        related_name="content_type_set_for_%(class)s")
     object_id      = models.PositiveIntegerField(_('object ID'))
-    content_object = generic.GenericForeignKey(ct_field="content_type", fk_field="object_id")
+    content_object = generic.GenericForeignKey("content_type", "object_id")
     
     is_mptt = models.BooleanField(default=False, editable=False)
     

wiki/models/urlpath.py

@@ -33,11 +33,19 @@ class URLPath(MPTTModel):
     objects = managers.URLPathManager()
     _default_manager = objects
     
-    articles = generic.GenericRelation(ArticleForObject)
+    articles = generic.GenericRelation(
+        ArticleForObject,
+        content_type_field='content_type',
+        object_id_field='object_id',
+    )
     
     # Do NOT modify this field - it is updated with signals whenever ArticleForObject is changed.
-    article = models.ForeignKey(Article, on_delete=models.CASCADE, editable=False,
-                                verbose_name=_(u'Cache lookup value for articles'))
+    article = models.ForeignKey(
+        Article, 
+        on_delete=models.CASCADE, 
+        editable=False,
+        verbose_name=_(u'Cache lookup value for articles'),
+    )
     
     SLUG_MAX_LENGTH = 50
     

wiki/plugins/notifications/models.py

@@ -26,13 +26,10 @@ class ArticleSubscription(ArticlePlugin, Subscription):
     
 
 def default_url(article, urlpath=None):
-    try:
-        if not urlpath:
-            urlpath = wiki_models.URLPath.objects.get(articles=article)
-        url = reverse('wiki:get', kwargs={'path': urlpath.path})
-    except wiki_models.URLPath.DoesNotExist:
-        url = reverse('wiki:get', kwargs={'article_id': article.id})
-    return url
+    if urlpath:
+        return reverse('wiki:get', kwargs={'path': urlpath.path})
+    return article.get_absolute_url()
+
 
 def post_article_revision_save(**kwargs):
     instance = kwargs['instance']