Changeset 12999 for trunk

Timestamp:

05/20/11 18:47:42 (13 years ago)

Author:

sil

Message:

• fixed a mistake in migration 20
• added migration to make hwaddress optional

Location:

trunk/sara_cmt/sara_cmt/cluster

Files:

• migrations/0020_rename_fields_telephonenumber_type_warrantycontract_type.py (modified) (2 diffs)
• migrations/0021_auto__chg_field_interface_hwaddress.py (added)
• models.py (modified) (2 diffs)

trunk/sara_cmt/sara_cmt/cluster/migrations/0020_rename_fields_telephonenumber_type_warrantycontract_type.py

@@ -182 +182 @@
             'Meta': {'object_name': 'Telephonenumber'},
             'areacode': ('django.db.models.fields.CharField', [], {'max_length': '4'}),
-            'connection': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'telephone_numbers'", 'blank': 'True', 'to': "orm['cluster.Connection']"}),
+            'connection': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'telephone_numbers'", 'to': "orm['cluster.Connection']"}),
             'country': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'telephone_numbers'", 'to': "orm['cluster.Country']"}),
             'created_on': ('django_extensions.db.fields.CreationDateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}),
@@ -201 +201 @@
             'note': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
             'tags': ('tagging.fields.TagField', [], {}),
-            'warranty_type_id': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'contracts'", 'null': 'True', 'to': "orm['cluster.WarrantyType']"}),
+            'warranty_type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'contracts'", 'null': 'True', 'to': "orm['cluster.WarrantyType']"}),
             'updated_on': ('django_extensions.db.fields.ModificationDateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'})
         },

trunk/sara_cmt/sara_cmt/cluster/models.py

@@ -145 +145 @@
     aliases   = models.CharField(max_length=255, help_text='Cnames comma-seperated', blank=True, null=True)
 
-    hwaddress = models.CharField(max_length=17, blank=True, #null=True,
+    hwaddress = models.CharField(max_length=17, blank=True, null=True,
                                  verbose_name='hardware address',
                                  help_text="6 Octets, optionally delimited by \
@@ -177 +177 @@
         """
         try:
+            if not self.hwaddress:
+                self.hwaddress = None
+
             if self.hwaddress and len(self.hwaddress) >= 12:
                 self.hwaddress = ':'.join(self.re_mac_octets.findall(self.hwaddress.lower()))