Merge branch 'feature/haystack' of github.com:afilsaime/Telemeta into feature/haystack

Conflicts:
	telemeta/search_indexes.py

diff --cc telemeta/forms/haystack_form.py
Simple merge

diff --cc telemeta/search_indexes.py
index 662de6087d457e007837d5c85f8ae6954d13c46f,88562e0d83e56994e9849f2670977cf12faeb1a4..94fd3986d96db4e7240cbaebca082a1bb2aef733
--- 1/telemeta/search_indexes.py
--- 2/telemeta/search_indexes.py
+++ b/telemeta/search_indexes.py
@@@ -8,9 -8,7 +8,10 @@@ class MediaItemIndex(indexes.SearchInde
      item_acces = indexes.CharField(model_attr='collection__public_access', faceted=True)
      item_status = indexes.CharField(model_attr='collection__document_status', faceted=True)
      digitized = indexes.BooleanField(default=False, faceted=True)
 +    recording_context = indexes.CharField(model_attr='collection__recording_context', default='', faceted=True)
 +    #original_format = indexes.CharField(model_attr='collection__original_format', default='', faceted=True)
 +    physical_format = indexes.CharField(model_attr='collection__physical_format', default='', faceted=True)
+     media_type = indexes.CharField(model_attr='media_type', null='None', faceted=True)
  
      #advance search
      title = indexes.NgramField(model_attr='title')
@@@ -46,9 -55,7 +58,10 @@@ class MediaCollectionIndex(indexes.Sear
      item_acces = indexes.CharField(model_attr='public_access', faceted=True)
      item_status = indexes.CharField(model_attr='document_status', faceted=True)
      digitized = indexes.BooleanField(default=False, 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)
+     media_type = indexes.CharField(model_attr='media_type', null='None', faceted=True)
  
      #advance search
      title = indexes.NgramField(model_attr='title')