Merge pull request #58 from Schlabonski/material_description

add material description

jdav_web/material/admin.py

@@ -36,7 +36,7 @@ class NotTooOldFilter(SimpleListFilter):
 class MaterialAdmin(admin.ModelAdmin):
     """Edit view of a MaterialPart"""
 
-    list_display = ('name', 'quantity_real', 'buy_date', 'lifetime', 'not_too_old', 'photo')
+    list_display = ('name', 'description', 'quantity_real', 'buy_date', 'lifetime', 'not_too_old', 'photo')
     inlines = [OwnershipInline]
     list_filter = (NotTooOldFilter,)
 

jdav_web/material/models.py

@@ -15,6 +15,7 @@ class MaterialPart(models.Model):
     members of the association (Ownership)
     """
     name = models.CharField(_('name'), max_length=30)
+    description = models.CharField(_('description'), default='', max_length=140)
     quantity = models.IntegerField(_('quantity'), default=0)
     buy_date = models.DateField(_('purchase date'), editable=True)
     lifetime = models.DecimalField(_('lifetime (years)'), decimal_places=0, max_digits=3)