remove commented stuff from admin file

remotes/origin/ESHOP_refactor_products_app
FUNNYDMAN 7 years ago
parent 1a9e008ed0
commit 7cd4a3fbce
  1. 28
      products/admin.py
  2. 39
      products/fixtures/manufacturer.json

@ -19,11 +19,9 @@ class CustomModelResource(resources.ModelResource):
""" """
try: try:
row['attributes'] = eval(row['attributes']) row['attributes'] = eval(row['attributes'])
row['discount_policy'] = eval(row['discount_policy'])
except: except:
try: pass
row['discount_policy'] = eval(row['discount_policy'])
except:
pass
class CustomManyToManyWidget(widgets.ManyToManyWidget): class CustomManyToManyWidget(widgets.ManyToManyWidget):
@ -37,14 +35,6 @@ class ProductImageInline(admin.TabularInline):
extra = 0 extra = 0
# class AttributeValueInline(admin.TabularInline):
# model = ProductAttributeValue
# form = ProductAttributeValueAdminForm
# extra = 1
# verbose_name_plural = _('Значение аттрибута')
# can_delete = True
@admin.register(ProductCategory) @admin.register(ProductCategory)
class ProductCategoryAdmin(SafeModelAdmin): class ProductCategoryAdmin(SafeModelAdmin):
list_display = ('name', 'slug', 'parent', 'status') list_display = ('name', 'slug', 'parent', 'status')
@ -52,15 +42,6 @@ class ProductCategoryAdmin(SafeModelAdmin):
list_filter = ('status', ('create_at', DateRangeFilter), ('updated_at', DateTimeRangeFilter)) 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) @admin.register(Manufacturer)
class ManufacturerAdmin(ImportExportModelAdmin, SafeModelAdmin): class ManufacturerAdmin(ImportExportModelAdmin, SafeModelAdmin):
list_display = ('name', 'slug', 'status') list_display = ('name', 'slug', 'status')
@ -72,11 +53,6 @@ class ManufacturerAdmin(ImportExportModelAdmin, SafeModelAdmin):
class ProductResource(CustomModelResource): class ProductResource(CustomModelResource):
# id = fields.Field(default=generate_Jid(prefix='J'),
# readonly=True,
# widget=widgets.CharWidget(),
# )
name = fields.Field(column_name='name', attribute='name', name = fields.Field(column_name='name', attribute='name',
default=None, default=None,
widget=widgets.CharWidget(), widget=widgets.CharWidget(),

@ -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}}] [
{
"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
}
}
]
Loading…
Cancel
Save