Fix search again

Author: stsewd

readthedocs/core/management/commands/reindex_elasticsearch.py

@@ -54,7 +54,7 @@ def handle(self, *args, **options):
                 update_search(
                     version.pk,
                     commit,
-                    doctype=project.documentation_type,
+                    doctype=version.project.documentation_type,
                     delete_non_commit_files=False
                 )
             except Exception as e:

readthedocs/projects/tasks.py

@@ -689,6 +689,7 @@ def update_app_instances(self, html=False, localmedia=False, search=False,
             callback=sync_callback.s(
                 version_pk=self.version.pk,
                 commit=self.build['commit'],
+                doctype=self.config.doctype,
             ),
         )
 
@@ -1313,14 +1314,14 @@ def clear_artifacts(paths):
 
 
 @app.task(queue='web')
-def sync_callback(_, version_pk, commit, *args, **kwargs):
+def sync_callback(_, version_pk, commit, doctype, *args, **kwargs):
     """
     Called once the sync_files tasks are done.
 
     The first argument is the result from previous tasks, which we discard.
     """
     fileify(version_pk, commit=commit)
-    update_search(version_pk, commit=commit)
+    update_search(version_pk, commit=commit, doctype=doctype)
 
 
 @app.task()