Merge lp:~cjohnston/qalm/fixes-1041282 into lp:qalm

[Chris Johnston]

Marks serial number as required

=== added file 'lab_manager/hardware/migrations/0003_make_sn_required.py'
--- lab_manager/hardware/migrations/0003_make_sn_required.py	1970-01-01 00:00:00 +0000
+++ lab_manager/hardware/migrations/0003_make_sn_required.py	2012-09-06 03:30:32 +0000
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Changing field 'Device.sn'
+        db.alter_column('hardware_device', 'sn', self.gf('django.db.models.fields.CharField')(max_length=100, null=True))
+
+    def backwards(self, orm):
+
+        # Changing field 'Device.sn'
+        db.alter_column('hardware_device', 'sn', self.gf('django.db.models.fields.CharField')(default='', max_length=100))
+
+    models = {
+        'hardware.device': {
+            'Meta': {'object_name': 'Device'},
+            'firmware': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip': ('django.db.models.fields.IPAddressField', [], {'max_length': '15', 'null': 'True', 'blank': 'True'}),
+            'lab': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['lab.Lab']"}),
+            'mac': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'make': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'}),
+            'notes': ('django.db.models.fields.TextField', [], {'max_length': '2047', 'blank': 'True'}),
+            'outlet': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'pdu': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hardware.Device']", 'null': 'True', 'blank': 'True'}),
+            'serial': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'sn': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'}),
+            'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['hardware.Type']"})
+        },
+        'hardware.type': {
+            'Meta': {'object_name': 'Type'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'lab.lab': {
+            'Meta': {'object_name': 'Lab'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['hardware']
\ No newline at end of file

=== modified file 'lab_manager/hardware/models/hardwaremodel.py'
--- lab_manager/hardware/models/hardwaremodel.py	2012-09-06 03:22:21 +0000
+++ lab_manager/hardware/models/hardwaremodel.py	2012-09-06 03:30:32 +0000
@@ -25,7 +25,7 @@
     name = models.CharField(max_length=100, verbose_name="Device Name", null=True)
     make = models.CharField(max_length=100, verbose_name="Manufacturer")
     model = models.CharField(max_length=100)
-    sn = models.CharField(max_length=100, verbose_name="Serial Number", blank=True)
+    sn = models.CharField(max_length=100, verbose_name="Serial Number", null=True)
     type = models.ForeignKey(Type, verbose_name="Device Type")
     firmware = models.CharField(max_length=100, verbose_name="Firmware Version")
     mac = models.CharField(max_length=100, verbose_name="MAC Address")