Changeset 6204

Timestamp:

Aug 15, 2008, 10:20:46 PM (17 years ago)

Author:

RIck van der Zwet

Message:

Moved to trunk of django new form formatting, hints:
​http://www.djangoproject.com/documentation/model-api/
​http://www.djangoproject.com/documentation/modelforms/

Location:

exodus

Files:

• models.py (modified) (1 diff)
• templates/addnode.html (modified) (1 diff)
• views.py (modified) (2 diffs)

exodus/models.py

@@ -67 +67 @@
     name = models.CharField(max_length=30, unique=True)
     location = models.ForeignKey(Location)
-    status = models.ForeignKey(Status)
+    status = models.ForeignKey(Status,default=1)
     masterip = models.IPAddressField()
-    network = models.ForeignKey(Network)
+    network = models.ForeignKey(Network,default=1)
  
     class Meta:

exodus/templates/addnode.html

@@ -6 +6 @@
 
 <form method="post" action=".">
-<div>
-        <label for="id_name">Node Name:</label> {{ form.name }}
-        {% if form.name.errors %} *** {{ form.name.errors|join:", " }}{% endif %}
-</div>
-<div>
-        <label for="id_location">Node Location:</label> {{ form.location}}
-        {% if form.location.errors %} *** {{ form.location.errors|join:", " }}{% endif %}
-</div>
-<div>
-        <label for="id_status">Node Network:</label> {{ form.network }}
-        {% if form.network.errors %} *** {{ form.network.errors|join:", " }}{% endif %}
-</div>
-<div>
-        <label for="id_status">Node Status:</label> {{ form.status }}
-        {% if form.status.errors %} *** {{ form.status.errors|join:", " }}{% endif %}
-</div>
-<div>
-        {% if form.masterip.errors %} *** MasterIP {{ form.masterip.errors|join:", " }} {% endif %}
-</div>
+<table>{{ form.as_table }}</table>
 <input type="submit" value="submit">
 </form>

exodus/views.py

@@ -8 +8 @@
 from socket import gethostname 
 
-from exodus.models import NIC, Node, Location, Link, LinkPool
+from exodus.models import Network, NIC, Node, Location, Link, LinkPool,Status
 from exodus.wllogic import freemasterip, newssidname
 
@@ -37 +37 @@
     return render_to_response('addlocation.html', {'form': form, 'new_data': new_data})
 
+class AddNodeForm(forms.ModelForm):
+        class Meta:
+                model = Node
+                exclude = ( 'masterip', )
+
 def addnode(request):
-        manipulator = Node.AddManipulator()
-
-        if request.POST:
-                new_data = request.POST.copy()
-
-                # input a valid master ip into new_data
-                new_data['masterip'] = freemasterip()
-
-                errors = manipulator.get_validation_errors(new_data)
-
-                if not errors:
-                        manipulator.do_html2python(new_data)
-                        new_place = manipulator.save(new_data)
-
+        if request.POST:
+                form = AddNodeForm(request.POST)
+                if form.is_valid():
+                        # input a valid master ip into new_data
+                        instance  = form.save(commit=False)
+                        instance.masterip = freemasterip()
+                        instance.save()
                         return HttpResponseRedirect("/exodus/")
-
-        else:
-                errors = new_data = {}
-
-        form = forms.FormWrapper(manipulator, new_data, errors)
+        else:
+                form = AddNodeForm()
         return render_to_response('addnode.html', {'form': form })