mods to django admin

companies/models.py

@@ -24,7 +24,7 @@ class Company(models.Model):
 
     cif = models.CharField('CIF', max_length=15, null=True, blank=True)
     company_name = models.CharField('Razón Social Cooperativa', max_length=1000, null=True, blank=True)
-    short_name = models.CharField('Apócope', max_length=100, null=True, blank=True) # autogenerar si blank
+    short_name = models.CharField('Nombre', max_length=100, null=True, blank=True) # autogenerar si blank
     web_link = models.URLField('Enlace a la web', null=True, blank=True)
     shop = models.BooleanField('Tienda Online', null=True, default=False)
     shop_link = models.URLField('Enlace a la tienda', null=True, blank=True)
@@ -52,7 +52,7 @@ class Company(models.Model):
     created = models.DateTimeField('date of creation', auto_now_add=True)
     updated = models.DateTimeField('date last update', auto_now=True)
     creator = models.ForeignKey('core.CustomUser', on_delete=models.DO_NOTHING, null=True, blank=True, related_name='creator')
-    history = models.ForeignKey(HistorySync, null=True, blank=True, on_delete=models.DO_NOTHING, related_name='company')
+    history = models.ForeignKey(HistorySync, null=True, blank=True, on_delete=models.DO_NOTHING, related_name='comp_hist')
 
     class Meta:
         verbose_name = "Compañía"

products/admin.py

@@ -5,18 +5,19 @@ from . import forms
 
 # Register your models here.
 
+
+def model_admin_callable(co):
+    return co.company_name
+
 class ProductAdmin(admin.ModelAdmin):
     form = forms.ProductTagForm
-    list_display = ('name', 'category', 'sourcing_date', 'company')
+    list_display = ('name', 'category', 'sourcing_date', 'company_name', 'active' )
     list_filter = ('company', 'tags', 'category', 'attributes')
     search_fields = ('name', 'sku', 'description')
 
+    def company_name(self, product):
+        return product.company.company_name
 
-'''
-class ProductInline(admin.TabularInline):
-    model = models.Product
-    form = forms.ProductTagForm
-'''
 
 admin.site.register(models.Product, ProductAdmin)
 admin.site.register(models.TreeTag)

products/models.py

@@ -64,7 +64,7 @@ class Product(models.Model):
     category = SingleTagField(to=CategoryTag, null=True, blank=True, on_delete=models.SET_NULL) # main tag category
     attributes = TagField(to=AttributeTag, blank=True, related_name='product_attributes')
     identifiers = models.TextField('Identificador único de producto', null=True, blank=True)
-    active = models.BooleanField('Mostrar producto', default=False)
+    active = models.BooleanField('Activo', default=False)
 
     # internal
     created = models.DateTimeField('date of creation', auto_now_add=True)