Skip to content
This repository
Browse code

Merge branch 'release/0.5.2' into develop

  • Loading branch information...
commit 533d7e278042b16bc0a860dbbcb1b8f91b906cf6 2 parents 5979ff7 + 2d783e1
Benjamin Wohlwend authored

Showing 3 changed files with 10 additions and 4 deletions. Show diff stats Hide diff stats

  1. +1 1  cms_search/__init__.py
  2. +2 2 docs/conf.py
  3. +7 1 docs/index.rst
2  cms_search/__init__.py
... ... @@ -1 +1 @@
1   -__version__ = '0.5.1'
  1 +__version__ = '0.5.2'
4 docs/conf.py
@@ -46,9 +46,9 @@
46 46 # built documents.
47 47 #
48 48 # The short X.Y version.
49   -version = '0.5.1'
  49 +version = '0.5.2'
50 50 # The full version, including alpha/beta/rc tags.
51   -release = '0.5.1'
  51 +release = '0.5.2'
52 52
53 53 # The language for content autogenerated by Sphinx. Refer to documentation
54 54 # for a list of supported languages.
8 docs/index.rst
Source Rendered
@@ -108,12 +108,18 @@ content.
108 108 haystack.autodiscover()
109 109
110 110
111   -.. :class:: cms_search.search_helpers.fields.MultiLangTemplateField
  111 +.. py:class:: cms_search.search_helpers.fields.MultiLangTemplateField
112 112
113 113 A :class:`haystack.indexes.CharField` subclass that renders the search
114 114 template in all languages defined in :setting:`django:LANGUAGES` and
115 115 concatenates the result.
116 116
  117 + .. note::
  118 +
  119 + If you plan to render django CMS placeholders in the template,
  120 + make sure to pass the ``needs_request`` argument to
  121 + :meth:`cms_search.search_helpers.fields.MultiLangTemplateField`.
  122 +
117 123 .. templatetag:: get_translated_value
118 124
119 125 ``{% get_translated_value %}`` template tag

0 comments on commit 533d7e2

Please sign in to comment.
Something went wrong with that request. Please try again.