mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-03 18:38:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Proofed the 1.6 release notes

Browse source
This commit is contained in:
Tim Graham 2013-06-05 12:55:50 -04:00
parent b00c6371af
commit bb863faecd
8 changed files with 81 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

5
docs/ref/contrib/admin/index.txt
View file

@ -1026,8 +1026,9 @@ subclass::
Performs a full-text match. This is like the default search method but
uses an index. Currently this is only available for MySQL.
If you need to customize search you can use :meth:`ModelAdmin.get_search_results` to provide additional or alternate
search behaviour.
If you need to customize search you can use
:meth:`ModelAdmin.get_search_results` to provide additional or alternate
search behavior.
Custom template options
~~~~~~~~~~~~~~~~~~~~~~~

34
docs/ref/contrib/syndication.txt
View file

@ -137,25 +137,29 @@ into those elements.
See `a complex example`_ below that uses a description template.
There is also a way to pass additional information to title and description
templates, if you need to supply more than the two variables mentioned
before. You can provide your implementation of ``get_context_data`` method
in your Feed subclass. For example::
.. method:: Feed.get_context_data(self, **kwargs)
from mysite.models import Article
from django.contrib.syndication.views import Feed
.. versionadded:: 1.6
class ArticlesFeed(Feed):
title = "My articles"
description_template = "feeds/articles.html"
There is also a way to pass additional information to title and description
templates, if you need to supply more than the two variables mentioned
before. You can provide your implementation of ``get_context_data`` method
in your ``Feed`` subclass. For example::
def items(self):
return Article.objects.order_by('-pub_date')[:5]
from mysite.models import Article
from django.contrib.syndication.views import Feed
def get_context_data(self, **kwargs):
context = super(ArticlesFeed, self).get_context_data(**kwargs)
context['foo'] = 'bar'
return context
class ArticlesFeed(Feed):
title = "My articles"
description_template = "feeds/articles.html"
def items(self):
return Article.objects.order_by('-pub_date')[:5]
def get_context_data(self, **kwargs):
context = super(ArticlesFeed, self).get_context_data(**kwargs)
context['foo'] = 'bar'
return context
And the template: