Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'release/0.5.2' into develop

  • Loading branch information...
commit 533d7e278042b16bc0a860dbbcb1b8f91b906cf6 2 parents 5979ff7 + 2d783e1
@piquadrat authored
Showing with 10 additions and 4 deletions.
  1. +1 −1  cms_search/__init__.py
  2. +2 −2 docs/conf.py
  3. +7 −1 docs/index.rst
View
2  cms_search/__init__.py
@@ -1 +1 @@
-__version__ = '0.5.1'
+__version__ = '0.5.2'
View
4 docs/conf.py
@@ -46,9 +46,9 @@
# built documents.
#
# The short X.Y version.
-version = '0.5.1'
+version = '0.5.2'
# The full version, including alpha/beta/rc tags.
-release = '0.5.1'
+release = '0.5.2'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
View
8 docs/index.rst
@@ -108,12 +108,18 @@ content.
haystack.autodiscover()
-.. :class:: cms_search.search_helpers.fields.MultiLangTemplateField
+.. py:class:: cms_search.search_helpers.fields.MultiLangTemplateField
A :class:`haystack.indexes.CharField` subclass that renders the search
template in all languages defined in :setting:`django:LANGUAGES` and
concatenates the result.
+ .. note::
+
+ If you plan to render django CMS placeholders in the template,
+ make sure to pass the ``needs_request`` argument to
+ :meth:`cms_search.search_helpers.fields.MultiLangTemplateField`.
+
.. templatetag:: get_translated_value
``{% get_translated_value %}`` template tag
Please sign in to comment.
Something went wrong with that request. Please try again.