Changeset 6320 for trunk

Timestamp:

Sep 30, 2008, 10:07:52 PM (16 years ago)

Author:

RIck van der Zwet

Message:

• Parsing the right URL to the corresponding object turned out to be a real PITA, created a example of a different URL syntax which will allow more easy parsing to get the right object.
• Implemented basics of edit/delete public interface

Location:

trunk/exodus

Files:

• models.py (modified) (1 diff)
• templates/delomni.html (copied) (copied from trunk/exodus/templates/delnode.html ) (1 diff, 1 prop)
• templates/exodus-template.html (modified) (2 diffs)
• templates/node-detail.html (modified) (3 diffs)
• urls.py (modified) (2 diffs)
• views.py (modified) (4 diffs)

trunk/exodus/models.py

@@ -123 +123 @@
 
     def __str__(self):
-        return "%s" % (self.shortdesc)
+        return "%s:%s" % (self.iface,self.pk)
 
 class DhcpStatic(models.Model):

trunk/exodus/templates/delomni.html

@@ -3 +3 @@
 {% block content %}
 
-<h1>Delete node {{ object.name }}</h1>
-
-Interfaces to be deleted:
-<ol>
-{% for nic in  object.interface_set.all %}
-<li>{{ nic }}</li>
-{% endfor %}
-</ol>
-
-All connected interfaces to be converted to master interfaces:
-<ol>
-{% for nic in  object.interface_set.all %}
-        {% ifequal nic.link nic %}
-                {% for interlink in nic.link.interface_set.all %}
-                        {% ifnotequal interlink nic %}
-                        <li> {{ interlink }}</li>
-                        {% endifnotequal %}
-                {% endfor %}
-        {% endifequal %}
-{% endfor %}
-</ol>
+<h1>Delete Public Access Point {{ object.name }}</h1>
 
 <form method="post" action=".">

trunk/exodus/templates/exodus-template.html

@@ -11 +11 @@
   <TR>
     <td class="menu" valign="top">
+      <div style="min-height:400px">
           <A name="top"><img width="130" height="82" alt="logo" src="{% url static path="logo.png" %}" border=0></A><br>
           <img width="130" height="97" alt="foto" src="{% url static path="foto.jpg" %}"/><br>
@@ -17 +18 @@
           &nbsp;&nbsp;<A class="menu" href="{% url exodus.views.addLocation %}">Add Location</a><br>
           &nbsp;&nbsp;<A class="menu" href="{% url exodus.views.addNode %}">Add Node</a><br>
+          </div>
         </td>
         <td valign="top" class="right">

trunk/exodus/templates/node-detail.html

@@ -5 +5 @@
 
 <div style="border:1px solid #000000;">
-<h1> {{ object.name }} </h1>
+<h1> {{ node.name }} </h1>
 <h3> Location </h3>
-Description: {{ object.location.description }} <br>
-Longitude: {{ object.location.longitude }} <br>
-Latitude: {{ object.location.latitude }} <br>
+Description: {{ node.location.description }} <br>
+Longitude: {{ node.location.longitude }} <br>
+Latitude: {{ node.location.latitude }} <br>
 
-Master ip: {{ object.masterip }} <br>
-<a href="{% url exodus.views.editNode object %}">EDIT</a>
-<a href="{% url exodus.views.delNode object %}">DELETE</a>
+Master ip: {{ node.masterip }} <br>
+<a href="{% url exodus.views.editNode node %}">EDIT</a>
+<a href="{% url exodus.views.delNode node %}">DELETE</a>
 </div>
 
 <h2>Interfaces</h2>
-<a href="{% url exodus.views.addInterface %}?node={{ object.name }}">Add new interface</a><p />
+<a href="{% url exodus.views.addInterface %}?node={{ node.name }}">Add new interface</a><p />
 
-{% for nic in object.interface_set.all %}
+{% for nic in node.interface_set.all %}
+        <div style="border:1px solid #000000;">
         <div style="border:1px solid #000000;">
         <h3>iface: {{ nic.iface }} </h3>
@@ -51 +52 @@
                 {% endifnotequal %}
         {% endfor %}
-        
-        <ul>
+        <ol>
         {% for accessPoint in nic.ap.all %}
                 <div style="border:1px solid #000000;">
                 <p />
                 <li>Public Access Point: {{ accessPoint.ip}}/{{accessPoint.netmask }}
+                <a href="{% url exodus.views.editPublicAP node.name nic.iface accessPoint.pk %}">EDIT</a>
+                <a href="{% url exodus.views.delPublicAP accessPoint %}">DELETE</a>
                 {% for dhcp in accessPoint.dhcpstatic.all %}
                         <ul>
@@ -67 +69 @@
                 </div>
         {% endfor %}
-        </ul>
+        </ol>
+        </div>
+        <p />
 {% endfor %}
 

trunk/exodus/urls.py

@@ -30 +30 @@
         url(r'^$', 'django.views.generic.simple.direct_to_template', {'template': 'index.html'}, "root") ,
         url(r'^nodelist/$', 'django.views.generic.list_detail.object_list', dict(node_dict, template_name='node-list.html'), "nodelist"),
-        url(r'^view/node/(?P<slug>.+)/$', 'django.views.generic.list_detail.object_detail', dict(node_dict,slug_field='name',template_name='node-detail.html'), "node-detail"),
+        url(r'^view/node/(?P<node>.+)/$', 'exodus.views.node', {}, "node-detail"),
 
         # config urls
@@ -50 +50 @@
         (r'^edit/nic/(?P<objectId>.+)/$', 'exodus.views.editInterface'),
         (r'^edit/link/(?P<object_id>.+)/$', 'exodus.views.addLink'),
-        (r'^edit/dhcp/(?P<object_id>.+)/$', 'exodus.views.addPublicAP'),
+        (r'^edit/dhcp/(?P<node>.+)/(?P<interface>.+)/(?P<publicAP>.+)/$', 'exodus.views.editPublicAP'),
 
         # delete/remove urls
         (r'^delete/node/(?P<objectId>.+)/$', 'exodus.views.delNode'),
         (r'^delete/nic/(?P<objectId>.+)/$', 'exodus.views.delInterface'),
+        (r'^delete/dhcp/(?P<objectId>.+)/$', 'exodus.views.delPublicAP'),
 )
 

trunk/exodus/views.py

@@ -31 +31 @@
                 model = Node
                 exclude = ( 'masterip' )
+
+def node(request, node):
+        object = Node.objects.get(name=node)
+        return render_to_response('node-detail.html', {'node': object})
 
 def addNode(request):
@@ -200 +204 @@
         return render_to_response('addinterlink.html',{'form': form})
 
-class addPublicAPForm(forms.ModelForm):
+class AddPublicAPForm(forms.ModelForm):
         class Meta:
                 model = PublicAP
@@ -207 +211 @@
 def addPublicAP(request):
         if request.POST:
-                form = addPublicAPForm(request.POST)
+                form = AddPublicAPForm(request.POST)
                 if form.is_valid():
                         instance = form.save(commit=False)
@@ -225 +229 @@
                         newPublicAP = PublicAP()
                         newPublicAP.iface = Interface.objects.get(iface=interfaceName, node=nodename2id(nodeName))
-                        form = addPublicAPForm(instance=newPublicAP)
-                else:
-                        form = addPublicAPForm()
+                        form = AddPublicAPForm(instance=newPublicAP)
+                else:
+                        form = AddPublicAPForm()
         return render_to_response('addomni.html', {'form': form })
+
+def editPublicAP(request, node, interface, publicAP):
+        nodeID = Node.objects.get(name=node)
+        iface = Interface.objects.get(node=nodeID, iface=interface)
+        publicAP = PublicAP.objects.get(iface=iface, pk=publicAP)
+        if request.POST:
+                form = AddPublicAPForm(request.POST, instance=publicAP)
+                if form.is_valid():
+                        form.save()
+                        #Properly redirect to view/<Node> needed
+                        message = 'Node Updated succesfully'
+                        node = publicAP.iface.node
+                        return HttpResponseRedirect(reverse('node-detail', args=[node]))
+                else:
+                        message = 'Form error, please edit and resubmit'
+        else:
+                message = 'Please edit and submit'
+                form = AddPublicAPForm(instance=publicAP)
+        return render_to_response('addnode.html', {'form': form, 'message' : message })
+
+def delPublicAP(request, objectId):
+        publicAP = PublicAP.objects.get(name=objectId)
+        node = publicAP.iface.node
+        if request.POST.has_key('cancel'):
+                return HttpResponseRedirect(reverse('node-detail', args=[node]))
+        elif request.POST.has_key('proceed'):
+                publicAP.delete()
+                return HttpResponseRedirect(reverse('node-detail', args=[node]))
+        else:
+                return render_to_response('delomni.html', {'object': publicAP })
 
 def nodename2id(node):