mirror
/
wagtail
kopia lustrzana https://github.com/wagtail/wagtail
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

AbstractDocument no longer depends on TagSearchable

pull/2738/head
Karl Hobley 2016-04-03 21:15:38 +01:00 zatwierdzone przez Karl Hobley
rodzic 6549b2d238
commit c2587b3b6c
1 zmienionych plików z 7 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

11
wagtail/wagtaildocs/models.py
Wyświetl plik

@ -14,7 +14,6 @@ from django.utils.translation import ugettext_lazy as _
from taggit.managers import TaggableManager
from wagtail.utils.deprecation import SearchFieldsShouldBeAList
from wagtail.wagtailadmin.taggable import TagSearchable
from wagtail.wagtailadmin.utils import get_object_usage
from wagtail.wagtailcore.models import CollectionMember
from wagtail.wagtailsearch import index
@ -26,7 +25,7 @@ class DocumentQuerySet(SearchableQuerySetMixin, models.QuerySet):
@python_2_unicode_compatible
class AbstractDocument(CollectionMember, TagSearchable):
class AbstractDocument(CollectionMember, index.Indexed, models.Model):
title = models.CharField(max_length=255, verbose_name=_('title'))
file = models.FileField(upload_to='documents', verbose_name=_('file'))
created_at = models.DateTimeField(verbose_name=_('created at'), auto_now_add=True)
@ -43,9 +42,13 @@ class AbstractDocument(CollectionMember, TagSearchable):
objects = DocumentQuerySet.as_manager()
search_fields = SearchFieldsShouldBeAList(TagSearchable.search_fields + CollectionMember.search_fields + [
search_fields = SearchFieldsShouldBeAList(CollectionMember.search_fields + [
index.SearchField('title', partial_match=True, boost=10),
index.RelatedFields('tags', [
index.SearchField('name', partial_match=True, boost=10),
]),
index.FilterField('uploaded_by_user'),
], name='search_fields on Document subclasses')
], name='search_fields on AbstractDocument subclasses')
def __str__(self):
return self.title