Remove unneeded merge migration (pulled files-on-anything just added)…

…. Shift migrations to depend on latest added (0117_set_is_root). - See if is_quickfiles exists in update_file method (preprints don't have this attribute).
CenterForOpenScience · Jul 16, 2018 · d84be3c · d84be3c
1 parent 1fce58c
commit d84be3c
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 22 deletions.
diff --git a/osf/migrations/0116_merge_20180702_1607.py b/osf/migrations/0116_merge_20180702_1607.py
diff --git a/...0117_update_preprint_model_for_divorce.py → ...0118_update_preprint_model_for_divorce.py b/...0117_update_preprint_model_for_divorce.py → ...0118_update_preprint_model_for_divorce.py
@@ -15,7 +15,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('osf', '0116_merge_20180702_1607'),
+        ('osf', '0117_set_is_root'),
     ]
 
     operations = [

diff --git a/...ations/0118_add_preprint_partial_index.py → ...ations/0119_add_preprint_partial_index.py b/...ations/0118_add_preprint_partial_index.py → ...ations/0119_add_preprint_partial_index.py
@@ -18,7 +18,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('osf', '0117_update_preprint_model_for_divorce'),
+        ('osf', '0118_update_preprint_model_for_divorce'),
     ]
 
     operations = [

diff --git a/osf/migrations/0119_preprint_node_divorce.py → osf/migrations/0120_preprint_node_divorce.py b/osf/migrations/0119_preprint_node_divorce.py → osf/migrations/0120_preprint_node_divorce.py
@@ -349,7 +349,7 @@ def divorce_preprints_from_nodes_sql(state, schema):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('osf', '0118_add_preprint_partial_index'),
+        ('osf', '0119_add_preprint_partial_index'),
     ]
 
     operations = [

diff --git a/..._transfer_preprint_service_permissions.py → ..._transfer_preprint_service_permissions.py b/..._transfer_preprint_service_permissions.py → ..._transfer_preprint_service_permissions.py
@@ -37,7 +37,7 @@ def migrate_preprint_service_permissions(state, schema):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('osf', '0119_preprint_node_divorce'),
+        ('osf', '0120_preprint_node_divorce'),
     ]
 
     operations = [

diff --git a/...tions/0121_remove_node_preprint_fields.py → ...tions/0122_remove_node_preprint_fields.py b/...tions/0121_remove_node_preprint_fields.py → ...tions/0122_remove_node_preprint_fields.py
@@ -8,7 +8,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('osf', '0120_transfer_preprint_service_permissions'),
+        ('osf', '0121_transfer_preprint_service_permissions'),
     ]
 
     operations = [

diff --git a/website/search/elastic_search.py b/website/search/elastic_search.py
@@ -681,7 +681,7 @@ def update_file(file_, index=None, delete=False):
         provider=file_.provider,
         path=file_.path,
     )
-    if target.is_quickfiles:
+    if getattr(target, 'is_quickfiles', None):
         node_url = '/{user_id}/quickfiles/'.format(user_id=target.creator._id)
     else:
         node_url = '/{target_id}/'.format(target_id=target._id)