Changeset 12997

Timestamp:

05/20/11 17:02:31 (13 years ago)

Author:

sil

Message:

some fields with reserved names has been renamed

Location:

trunk/sara_cmt/sara_cmt/cluster

Files:

• migrations/0020_rename_fields_telephonenumber_type_warrantycontract_type.py (added)
• models.py (modified) (4 diffs)

trunk/sara_cmt/sara_cmt/cluster/models.py

@@ -37 +37 @@
     def __unicode__(self):
         return self.name or None
+
+    def validate_unique(exclude=None):
+        logger.error('Called VALIDATE_UNIQUE')
 
 
@@ -145 +148 @@
     aliases   = models.CharField(max_length=255, help_text='Cnames comma-seperated', blank=True, null=True)
 
-    hwaddress = models.CharField(max_length=17, blank=True,
+    hwaddress = models.CharField(max_length=17, blank=True, #null=True,
                                  verbose_name='hardware address',
                                  help_text="6 Octets, optionally delimited by \
@@ -506 +509 @@
     areacode          = models.CharField(max_length=4) # because it can start with a zero
     subscriber_number = models.IntegerField(verbose_name='number', max_length=15)
-    # !!! TODO: type is a reserved name, so rename to numtype in a migration.... and make this a ChoiceField? !!!
-    type = models.CharField(max_length=1, choices=NUMBER_CHOICES)
+    number_type = models.CharField(max_length=1, choices=NUMBER_CHOICES)
 
     # !!! TODO: link to company / contact / etc... !!!
@@ -617 +619 @@
 class WarrantyContract(ModelExtension):
     """
-        A class which contains warranty information of (a collection of) hardware.
-    """
-    # !!! TODO: type is a reserved name, so rename to vartype in a migration !!!
-    type = models.ForeignKey(WarrantyType, blank=True, null=True, related_name='contracts')
+        A class which contains warranty information of (a collection of) hardware. (SLA)
+    """
+    warranty_type = models.ForeignKey(WarrantyType, blank=True, null=True, related_name='contracts')
 
     label     = models.CharField(max_length=255, unique=True)