UI improvements to the admin area

Author: webpigeon

inventory/admin.py

@@ -1,7 +1,7 @@
 # Inventory Admin Area for Meander
 
 from django.contrib import admin
-from inventory.models import System, SystemModel, Peripheral, Accessory
+from inventory.models import System, SystemModel, Peripheral, PeripheralModel, Accessory
 
 class SystemAdmin(admin.ModelAdmin):
 	list_display = ('tag', 'model')
@@ -14,12 +14,40 @@ class SystemAdmin(admin.ModelAdmin):
 			})
 		)
 
+	# Don't allow editing of the PK after creation
+	def get_readonly_fields(self, request, obj=None):
+		if obj:
+			return ['tag']
+		else:
+			return []
+
 admin.site.register(System, SystemAdmin)
-admin.site.register(SystemModel)
 
-admin.site.register(Peripheral)
+class SystemModelAdmin(admin.ModelAdmin):
+	fieldsets = (
+			(None, { 'fields': ('manufacturer', 'product_name')}),
+			("Advanced", { 'classes':('collapse',),'fields': ('sku_number', 'family')})
+	)
+
+admin.site.register(SystemModel, SystemModelAdmin)
+
+class PeripheralModelAdmin(admin.ModelAdmin):
+	list_display = ('__unicode__', 'total')
+admin.site.register(PeripheralModel, PeripheralModelAdmin)
+
+class PeripheralAdmin(admin.ModelAdmin):
+	fields = ('tag', 'model')
+	list_display = ('tag', 'model')
+
+	# Don't allow editing of the PK after creation
+	def get_readonly_fields(self, request, obj=None):
+		if obj:
+			return ['tag']
+		else:
+			return []
+admin.site.register(Peripheral, PeripheralAdmin)
 
 class AccessoryAdmin(admin.ModelAdmin):
 	list_display = ('__unicode__', 'stock', 'needs_reorder')
-
+	list_editable = ('stock',)
 admin.site.register(Accessory, AccessoryAdmin)

inventory/models.py

@@ -19,6 +19,9 @@ class BaseModel(models.Model):
 	manufacturer = models.CharField(max_length=255) # must be non-null
 	product_name = models.CharField(max_length=255) # must be non-null
 
+	def __unicode__(self):
+		return self.manufacturer + " " + self.product_name
+
 	class Meta:
 		abstract = True
 
@@ -35,8 +38,8 @@ class Meta:
 # the inventory system and may have support contracts and software licences.
 ##
 class SystemModel(BaseModel):
-	sku_number = models.CharField(max_length=255, blank=True, null=True)
-	family = models.CharField(max_length=255, blank=True, null=True)
+	sku_number = models.CharField(max_length=255, blank=True, null=True, help_text="A number which uniquly idenfies this configuration (eg. nc2400#abu).")
+	family = models.CharField(max_length=255, blank=True, null=True, help_text="The family of products this unit it from (eg. Compaq 6200 Pro series)")
 
 	def __unicode__(self):
 		return "%s %s" % (self.manufacturer, self.product_name)
@@ -55,11 +58,16 @@ def __unicode__(self):
 # tagged and tracked like systems.
 ##
 class PeripheralModel(BaseModel):
-	pass
+	
+	def total(self):
+		return self.peripheral_set.count()
 
 class Peripheral(BaseAsset):
 	model = models.ForeignKey(PeripheralModel)
 
+	def __unicode__(self):
+		return self.tag
+
 ##
 # Accessories
 # Arn't indivually tracked, they mearly have a stock level. This category is mostly for alerting IT staff