Changeset 6443

Timestamp:

Dec 11, 2008, 9:40:41 PM (16 years ago)

Author:

roland

Message:

Fixed some bugs in forms.py

File:

• trunk/exodus/forms.py (modified) (2 diffs)

trunk/exodus/forms.py

@@ -31 +31 @@
 
     def clean_link(self):
-        import pdb; pdb.set_trace() ;
         link = self.cleaned_data.get('link')
         # the type of the interface, eth, 11a, 11b, 11g.
         type = self.cleaned_data.get('type')
 
-        try:
-            # self.instance.pk only exists when this interface has been saved
-            # before. Primary Keys's always start at 1.
-            if self.instance.pk:
-                edit = True 
-                # save self.instance for further reference, so that we
-                # don't have to try, except instance everytime.
-                instance_pk = self.instance.pk
-                instance_node_id = self.instance.node_id
-        except Interface.DoesNotExist:
-            edit = instance_pk = instance_node_id = None
+        # self.instance raises DoesNotExist, but self.instance.[pk, ssid, polar, etc] doesn't
+        # Primary Keys's always start at 1.
+        if self.instance.pk:
+            edit = True 
+        else:
+            edit = False
             
         if link:
             # if link is to self we don't need to check anything else
-            if instance_pk == link.pk:
+            if self.instance.pk == link.pk:
                 return link
             # Link can't be to same node, unless link is to self, 
             # which we checked above.
-            elif instance_node_id == link.node_id:
+            elif self.instance.node_id == link.node_id:
                 raise forms.ValidationError(
                     "A link can't be to another interface on the same node")
@@ -119 +113 @@
         # to itself.
         elif edit:
-            link = Interface.objects.get(pk=instance_pk)
+            link = Interface.objects.get(pk=self.instance.pk)
             return link
         # This is a new interface, can't be linked to itself because it hasn't