diff --git a/.gitignore b/.gitignore index accb26a..320f13b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ docs/_build + +.DS_Store diff --git a/articles/modules/category/models.py b/articles/modules/category/models.py index 063a79c..97e0b31 100644 --- a/articles/modules/category/models.py +++ b/articles/modules/category/models.py @@ -69,9 +69,16 @@ class Meta: def __str__(self): return self.name + # FIXME: urls refers to views that are not CB as in views.py + # @app_models.permalink + # def get_absolute_url(self): + # return ('article_category', 'articles.urls', (self.local_url,)) @app_models.permalink def get_absolute_url(self): - return ('article_category', 'articles.urls', (self.local_url,)) + return ('article_detail', 'articles.urls', (), { + 'category_url': self.local_url, + 'slug': self.slug, + }) mptt.register(Category) diff --git a/articles/templatetags/article.py b/articles/templatetags/article.py index 32be3b1..a046631 100644 --- a/articles/templatetags/article.py +++ b/articles/templatetags/article.py @@ -33,17 +33,12 @@ def render(self, context): articles = self.articles and self.articles.resolve(context) limit = self.limit and self.limit.resolve(context) - if articles is None: - user = None - if 'request' in context: - user = context['request'].user - articles = Article.objects.active(user=user).select_related() + articles = Article.objects.active().select_related() if limit is not None: articles = articles[:limit] - if self.varname is not None: context[self.varname] = articles return ''