Product block for all pages

diff --git a/app/organization/shop/admin.py b/app/organization/shop/admin.py
index 26c2b9a5ab8b919c2cf807fa419200ede2cacff4..990954e9ae4e9fcadd8cd9a8303454806f42cc19 100644 (file)
--- a/app/organization/shop/admin.py
+++ b/app/organization/shop/admin.py
@@ -11,14 +11,14 @@ from organization.media.models import Video, Audio
 from organization.shop.models import *
 
 
-class ProductBlockProductInline(StackedDynamicInlineAdmin):
+class ProductBlockProductInline(TabularDynamicInlineAdmin):
 
     model = ProductBlockProduct
 
 
-class ProductBlockAdmin(admin.ModelAdmin):
+class ProductBlockAdmin(BaseTranslationModelAdmin):
 
-    inlines = [ProductBlockProductInline]
+    inlines = [ProductBlockProductInline, ]
 
 
 admin.site.register(ProductBlock, ProductBlockAdmin)

diff --git a/app/organization/shop/migrations/0002_auto_20160923_1749.py b/app/organization/shop/migrations/0002_auto_20160923_1749.py
new file mode 100644 (file)
index 0000000..6bf75a9
--- /dev/null
+++ b/app/organization/shop/migrations/0002_auto_20160923_1749.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-09-23 15:49
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-shop', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='pageproductblock',
+            name='page',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='product_blocks', to='pages.Page', verbose_name='page'),
+        ),
+    ]

diff --git a/app/organization/shop/models.py b/app/organization/shop/models.py
index 86f19a65853b25cbc77c85f78e5f49efac14e6ba..983c8c596778a3272ede4ee1e4b580a1cd3edc2d 100644 (file)
--- a/app/organization/shop/models.py
+++ b/app/organization/shop/models.py
@@ -40,7 +40,7 @@ class ProductBlockProduct(Orderable):
 
 class PageProductBlock(models.Model):
 
-    page = models.ForeignKey('organization-pages.CustomPage', verbose_name=_('page'), related_name='product_blocks', blank=True, null=True, on_delete=models.SET_NULL)
+    page = models.ForeignKey('pages.Page', verbose_name=_('page'), related_name='product_blocks', blank=True, null=True, on_delete=models.SET_NULL)
     product_block = models.ForeignKey('organization-shop.ProductBlock', verbose_name=_('product block'), related_name='pages', blank=True, null=True, on_delete=models.SET_NULL)
 
     class Meta: