Merge branch 'feature/export-progress' into develop

cookbook/migrations/0159_add_shoppinglistentry_fields.py

@@ -140,5 +140,10 @@ class Migration(migrations.Migration):
             old_name='ignore_shopping',
             new_name='food_onhand',
         ),
+        migrations.AddField(
+            model_name='space',
+            name='show_facet_count',
+            field=models.BooleanField(default=False),
+        ),
         migrations.RunPython(copy_values_to_sle),
     ]

cookbook/migrations/0164_space_show_facet_count.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.11 on 2022-01-17 22:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0163_auto_20220105_0758'),
+    ]
+
+    operations = [
+        # migrations.AddField(
+        #     model_name='space',
+        #     name='show_facet_count',
+        #     field=models.BooleanField(default=False),
+        # ),
+        # removed due to quick fix in 0159 migration to maintain correct order
+    ]

cookbook/migrations/0165_remove_step_type.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.2.11 on 2022-01-18 19:19
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0164_space_show_facet_count'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='step',
+            name='type',
+        ),
+    ]

cookbook/migrations/0166_alter_userpreference_shopping_add_onhand.py

@@ -0,0 +1,26 @@
+# Generated by Django 3.2.11 on 2022-01-20 14:39
+
+from django.db import migrations, models
+from django_scopes import scopes_disabled
+
+
+def add_default_trigram(apps, schema_editor):
+    with scopes_disabled():
+        UserPreference = apps.get_model('cookbook', 'UserPreference')
+
+        UserPreference.objects.all().update(shopping_add_onhand=False)
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('cookbook', '0165_remove_step_type'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userpreference',
+            name='shopping_add_onhand',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.RunPython(add_default_trigram),
+    ]

cookbook/migrations/0167_userpreference_left_handed.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.11 on 2022-01-20 22:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0166_alter_userpreference_shopping_add_onhand'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userpreference',
+            name='left_handed',
+            field=models.BooleanField(default=False),
+        ),
+    ]