arkindex/documents/indexer.py

@@ -28,11 +28,11 @@ class Indexer(object):
                             "transcriptions": {
                                 "type": "nested",
                                 "properties": {
-                                    "id": {"type": "text"},
-                                    "type": {"type": "text"},
+                                    "id": {"type": "keyword"},
+                                    "type": {"type": "keyword"},
                                     "score": {"type": "float"},
                                     "text": {"type": "text"},
-                                    "corpus": {"type": "text"}
+                                    "corpus": {"type": "keyword"}
                                 }
                             }
                         }

arkindex/templates/elastic/search_acts.json

@@ -21,11 +21,10 @@
                                     "transcriptions.corpus": "{{ corpus_id }}"
                                 }
                             },
-                            {% endif %}
                             {% elif corpora_ids %}
                             {
                                 "terms": {
-                                    "transcriptions.corpus.keyword": [
+                                    "transcriptions.corpus": [
                                         {% for corpus_id in corpora_ids %}
                                         "{{ corpus_id }}"{% if forloop.revcounter0 != 0 %},{% endif %}
                                         {% endfor %}

arkindex/users/admin.py

@@ -39,7 +39,7 @@ class UserChangeForm(forms.ModelForm):
     the user, but replaces the password field with admin's
     password hash display field.
     """
-    password = ReadOnlyPasswordHashField()
+    password = ReadOnlyPasswordHashField(help_text='<a href="../password/">Change password</a>')
 
     class Meta:
         model = User

arkindex/users/tests/test_providers.py

+from arkindex.users import providers
+from arkindex.users.providers import get_provider
+from django.test import TestCase
+
+
+class TestProviders(TestCase):
+
+    def test_get_provider(self):
+
+        class SomeProvider(object):
+            pass
+
+        providers.oauth_providers = [SomeProvider]
+        self.assertEqual(get_provider('SomeProvider'), SomeProvider)
+        self.assertIsNone(get_provider('doesnotexist'))