Merge branch 'release/0.8.x' into develop
This commit is contained in:
commit
1d3e9972c5
3 changed files with 39 additions and 30 deletions
|
@ -17,6 +17,12 @@ History
|
||||||
* Enabled cached version of BlogLatestEntriesPlugin.
|
* Enabled cached version of BlogLatestEntriesPlugin.
|
||||||
* Added plugins templateset
|
* Added plugins templateset
|
||||||
|
|
||||||
|
******************
|
||||||
|
0.8.6 (unreleased)
|
||||||
|
******************
|
||||||
|
|
||||||
|
* Set the correct language during indexing
|
||||||
|
|
||||||
******************
|
******************
|
||||||
0.8.5 (2016-06-26)
|
0.8.5 (2016-06-26)
|
||||||
******************
|
******************
|
||||||
|
|
|
@ -3,6 +3,7 @@ from aldryn_search.helpers import get_plugin_index_data
|
||||||
from aldryn_search.utils import get_index_base, strip_tags
|
from aldryn_search.utils import get_index_base, strip_tags
|
||||||
from django.utils.encoding import force_text
|
from django.utils.encoding import force_text
|
||||||
from haystack import indexes
|
from haystack import indexes
|
||||||
|
from parler.utils.context import switch_language
|
||||||
|
|
||||||
from .models import Post
|
from .models import Post
|
||||||
from .settings import get_setting
|
from .settings import get_setting
|
||||||
|
@ -44,6 +45,7 @@ class PostIndex(get_index_base()):
|
||||||
return Post
|
return Post
|
||||||
|
|
||||||
def get_search_data(self, post, language, request):
|
def get_search_data(self, post, language, request):
|
||||||
|
with switch_language(post, language):
|
||||||
description = post.get_description()
|
description = post.get_description()
|
||||||
abstract = strip_tags(post.safe_translation_getter('abstract', default=''))
|
abstract = strip_tags(post.safe_translation_getter('abstract', default=''))
|
||||||
keywords = post.get_keywords()
|
keywords = post.get_keywords()
|
||||||
|
|
1
tox.ini
1
tox.ini
|
@ -8,6 +8,7 @@ deps =
|
||||||
django18: django-mptt>=0.8
|
django18: django-mptt>=0.8
|
||||||
django18: django-filer<1.3
|
django18: django-filer<1.3
|
||||||
django18: cmsplugin-filer<1.2
|
django18: cmsplugin-filer<1.2
|
||||||
|
django18: django-haystack
|
||||||
django19: Django>=1.9,<1.10
|
django19: Django>=1.9,<1.10
|
||||||
django19: django-mptt>=0.8
|
django19: django-mptt>=0.8
|
||||||
django19: django-filer<1.3
|
django19: django-filer<1.3
|
||||||
|
|
Loading…
Reference in a new issue