From 805f573b7da357f0dd828a3214b1ec1d47aad25a Mon Sep 17 00:00:00 2001 From: FreneticScribbler Date: Mon, 2 Mar 2020 17:53:39 +0000 Subject: [PATCH] Add nickname field to assets So we can stop storing nicknames in the sodding serial number --- assets/migrations/0011_asset_nickname.py | 18 ++++++++++++++++++ assets/models.py | 1 + assets/templates/partials/asset_form.html | 7 +++++++ 3 files changed, 26 insertions(+) create mode 100644 assets/migrations/0011_asset_nickname.py diff --git a/assets/migrations/0011_asset_nickname.py b/assets/migrations/0011_asset_nickname.py new file mode 100644 index 00000000..9d7bdb45 --- /dev/null +++ b/assets/migrations/0011_asset_nickname.py @@ -0,0 +1,18 @@ +# Generated by Django 2.0.13 on 2020-03-02 17:53 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('assets', '0010_auto_20200207_1737'), + ] + + operations = [ + migrations.AddField( + model_name='asset', + name='nickname', + field=models.CharField(blank=True, max_length=20, unique=True), + ), + ] diff --git a/assets/models.py b/assets/models.py index 5bf830bc..51a7c6ed 100644 --- a/assets/models.py +++ b/assets/models.py @@ -82,6 +82,7 @@ class Asset(models.Model, RevisionMixin): category = models.ForeignKey(to=AssetCategory, on_delete=models.CASCADE) status = models.ForeignKey(to=AssetStatus, on_delete=models.CASCADE) serial_number = models.CharField(max_length=150, blank=True) + nickname = models.CharField(max_length=20, blank=True, unique=True) purchased_from = models.ForeignKey(to=Supplier, on_delete=models.CASCADE, blank=True, null=True, related_name="assets") date_acquired = models.DateField() date_sold = models.DateField(blank=True, null=True) diff --git a/assets/templates/partials/asset_form.html b/assets/templates/partials/asset_form.html index 45424992..50dd1815 100644 --- a/assets/templates/partials/asset_form.html +++ b/assets/templates/partials/asset_form.html @@ -32,6 +32,10 @@ {% render_field form.serial_number|add_class:'form-control' value=object.serial_number %} +
+ + {% render_field form.nickname|add_class:'form-control' value=object.nickname %} +
@@ -53,6 +57,9 @@
Serial Number
{{ object.serial_number|default:'-' }}
+
Nickname
+
{{ object.nickname|default:'-' }}
+
Comments
{{ object.comments|default:'-'|linebreaksbr }}
{% endif %}