add item status filter from simple search to advance search

diff --git a/examples/sandbox/src/django-haystack b/examples/sandbox/src/django-haystack
index 97475f2813a36e402296d5f2389fe10cd4cd1e0b..bd60745ce82318b1819768c9a31db0579228654d 160000 (submodule)
--- a/examples/sandbox/src/django-haystack
+++ b/examples/sandbox/src/django-haystack
@@ -1 +1 @@
-Subproject commit 97475f2813a36e402296d5f2389fe10cd4cd1e0b
+Subproject commit bd60745ce82318b1819768c9a31db0579228654d

diff --git a/telemeta/forms/haystack_form.py b/telemeta/forms/haystack_form.py
index 67a2a082edb8e591e03623058e59d6331e634ef4..b97dbe99938464ba042ad1e9911843d5924fb309 100644 (file)
--- a/telemeta/forms/haystack_form.py
+++ b/telemeta/forms/haystack_form.py
@@ -46,7 +46,9 @@ class HayAdvanceForm(SearchForm):
     year_published_from = forms.IntegerField(required=False, label=('Year published from'), widget=forms.TextInput(attrs={'type': 'search', 'placeholder': 'YYYY', 'pattern': '[0-9]{4}'}))
     year_published_to = forms.IntegerField(required=False, label=('Year published to'), widget=forms.TextInput(attrs={'type': 'search', 'placeholder': 'YYYY', 'pattern': '[0-9]{4}'}))
     #digitized = forms.BooleanField(required=False, label=('Digitized'))
-    media_type = forms.CharField(required=False, label=('Media'), widget=forms.RadioSelect(choices=(('dig', 'digitized'), ('aud', 'audio'), ('vid', 'video'), ('nop', 'no preference'))))
+    item_status = forms.CharField(required=False, label=('Media'), widget=forms.RadioSelect(choices=(('nop', 'no preference'), ('pub', 'Published'), ('unpub', 'Unpublished'))))
+    viewable = forms.BooleanField(required=False, label=('Viewable'))
+    media_type = forms.CharField(required=False, label=('Media'), widget=forms.RadioSelect(choices=(('nop', 'no preference'), ('aud', 'audio'), ('vid', 'video'), ('dig', 'digitized'))))
 
     def search(self):
         sqs = SearchQuerySet().load_all()

diff --git a/telemeta/search_indexes.py b/telemeta/search_indexes.py
index 3c7c0bc9359a595d16e367d87e2ec23c11f9e52f..44e813bfe36baffeca2d8dbe3c355aef18d1d271 100644 (file)
--- a/telemeta/search_indexes.py
+++ b/telemeta/search_indexes.py
@@ -70,7 +70,7 @@ class MediaCollectionIndex(indexes.SearchIndex, indexes.Indexable):
     item_status = indexes.CharField(model_attr='document_status', faceted=True)
     digitized = indexes.BooleanField(default=False, faceted=True)
     media_type = indexes.CharField(model_attr='media_type', null='None', faceted=True)
-    recording_context = indexes.CharField(model_attr='recording_context', default='' ,faceted=True)
+    recording_context = indexes.CharField(model_attr='recording_context', default='', faceted=True)
     #original_format = indexes.CharField(model_attr='original_format', default='', faceted=True)
     physical_format = indexes.CharField(model_attr='physical_format', default='', faceted=True)