update migrations

cookbook/migrations/0159_add_shoppinglistentry_fields.py

@@ -6,7 +6,7 @@ from django.conf import settings
 from django.db import migrations, models
 from django_scopes import scopes_disabled
 
-from cookbook.models import ShoppingListEntry
+from cookbook.models import PermissionModelMixin, ShoppingListEntry
 
 
 def copy_values_to_sle(apps, schema_editor):
@@ -16,10 +16,8 @@ def copy_values_to_sle(apps, schema_editor):
             if entry.shoppinglist_set.first():
                 entry.created_by = entry.shoppinglist_set.first().created_by
                 entry.space = entry.shoppinglist_set.first().space
-            if entry.list_recipe:
-                entry.recipe = entry.list_recipe.recipe
         if entries:
-            ShoppingListEntry.objects.bulk_update(entries, ["created_by", "recipe"])
+            ShoppingListEntry.objects.bulk_update(entries, ["created_by", "space", ])
 
 
 class Migration(migrations.Migration):
@@ -52,11 +50,6 @@ class Migration(migrations.Migration):
             field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='auth.user'),
             preserve_default=False,
         ),
-        migrations.AddField(
-            model_name='shoppinglistentry',
-            name='recipe',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='cookbook.recipe'),
-        ),
         migrations.AddField(
             model_name='userpreference',
             name='shopping_share',
@@ -73,21 +66,11 @@ class Migration(migrations.Migration):
             name='mealplan',
             field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='cookbook.mealplan'),
         ),
-        migrations.AddField(
-            model_name='shoppinglistrecipe',
-            name='name',
-            field=models.CharField(blank=True, default='', max_length=32),
-        ),
         migrations.AddField(
             model_name='shoppinglistentry',
             name='ingredient',
             field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='cookbook.ingredient'),
         ),
-        migrations.AddField(
-            model_name='shoppinglistrecipe',
-            name='name',
-            field=models.CharField(blank=True, default='', max_length=32),
-        ),
         migrations.AlterField(
             model_name='shoppinglistentry',
             name='unit',
@@ -157,15 +140,5 @@ class Migration(migrations.Migration):
             name='shopping_recent_days',
             field=models.PositiveIntegerField(default=7),
         ),
-        migrations.AddField(
-            model_name='userpreference',
-            name='filter_to_supermarket',
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AddField(
-            model_name='userpreference',
-            name='shopping_recent_days',
-            field=models.PositiveIntegerField(default=7),
-        ),
         migrations.RunPython(copy_values_to_sle),
     ]

vue/src/apps/ShoppingListView/main.js

@@ -4,6 +4,13 @@ import App from "./ShoppingListView"
 
 Vue.config.productionTip = false
 
+// TODO move this and other default stuff to centralized JS file (verify nothing breaks)
+let publicPath = localStorage.STATIC_URL + "vue/"
+if (process.env.NODE_ENV === "development") {
+    publicPath = "http://localhost:8080/"
+}
+export default __webpack_public_path__ = publicPath // eslint-disable-line
+
 new Vue({
     i18n,
     render: (h) => h(App),