diff --git a/products/admin.py b/products/admin.py index c136f54..e0314d3 100644 --- a/products/admin.py +++ b/products/admin.py @@ -19,11 +19,9 @@ class CustomModelResource(resources.ModelResource): """ try: row['attributes'] = eval(row['attributes']) + row['discount_policy'] = eval(row['discount_policy']) except: - try: - row['discount_policy'] = eval(row['discount_policy']) - except: - pass + pass class CustomManyToManyWidget(widgets.ManyToManyWidget): @@ -37,14 +35,6 @@ class ProductImageInline(admin.TabularInline): extra = 0 -# class AttributeValueInline(admin.TabularInline): -# model = ProductAttributeValue -# form = ProductAttributeValueAdminForm -# extra = 1 -# verbose_name_plural = _('Значение аттрибута') -# can_delete = True - - @admin.register(ProductCategory) class ProductCategoryAdmin(SafeModelAdmin): list_display = ('name', 'slug', 'parent', 'status') @@ -52,15 +42,6 @@ class ProductCategoryAdmin(SafeModelAdmin): list_filter = ('status', ('create_at', DateRangeFilter), ('updated_at', DateTimeRangeFilter)) -# @admin.register(ProductAttribute) -# class ProductAttributeAdmin(ImportExportModelAdmin, SafeModelAdmin): -# inlines = [ -# # AttributeValueInline -# ] -# list_display = ('name', 'slug') -# search_fields = ('name', 'slug') - - @admin.register(Manufacturer) class ManufacturerAdmin(ImportExportModelAdmin, SafeModelAdmin): list_display = ('name', 'slug', 'status') @@ -72,11 +53,6 @@ class ManufacturerAdmin(ImportExportModelAdmin, SafeModelAdmin): class ProductResource(CustomModelResource): - # id = fields.Field(default=generate_Jid(prefix='J'), - # readonly=True, - # widget=widgets.CharWidget(), - # ) - name = fields.Field(column_name='name', attribute='name', default=None, widget=widgets.CharWidget(), diff --git a/products/fixtures/manufacturer.json b/products/fixtures/manufacturer.json index 3aeebe7..e77f1ee 100644 --- a/products/fixtures/manufacturer.json +++ b/products/fixtures/manufacturer.json @@ -1 +1,38 @@ -[{"model": "products.manufacturer", "pk": 1, "fields": {"create_at": "2018-08-12T19:24:12.126Z", "updated_at": "2018-08-12T19:24:12.126Z", "name": "Microsoft", "slug": "microsoft", "image": "", "status": 25}}, {"model": "products.manufacturer", "pk": 2, "fields": {"create_at": "2018-08-12T19:24:18.725Z", "updated_at": "2018-08-12T19:24:18.725Z", "name": "Parallels", "slug": "parallels", "image": "", "status": 25}}, {"model": "products.manufacturer", "pk": 3, "fields": {"create_at": "2018-08-12T19:24:31.655Z", "updated_at": "2018-08-12T19:24:31.655Z", "name": "Eset", "slug": "eset", "image": "", "status": 25}}] \ No newline at end of file +[ + { + "model": "products.manufacturer", + "pk": 1, + "fields": { + "create_at": "2018-08-12T19:24:12.126Z", + "updated_at": "2018-08-12T19:24:12.126Z", + "name": "Microsoft", + "slug": "microsoft", + "image": "", + "status": 25 + } + }, + { + "model": "products.manufacturer", + "pk": 2, + "fields": { + "create_at": "2018-08-12T19:24:18.725Z", + "updated_at": "2018-08-12T19:24:18.725Z", + "name": "Parallels", + "slug": "parallels", + "image": "", + "status": 25 + } + }, + { + "model": "products.manufacturer", + "pk": 3, + "fields": { + "create_at": "2018-08-12T19:24:31.655Z", + "updated_at": "2018-08-12T19:24:31.655Z", + "name": "Eset", + "slug": "eset", + "image": "", + "status": 25 + } + } +] \ No newline at end of file