Changeset 6283

Timestamp:

Sep 15, 2008, 9:06:43 PM (17 years ago)

Author:

RIck van der Zwet

Message:

• First attempt of new URL styles, removed number of fixed references
• made initial setup of edit functionality at Node Style.

Location:

exodus

Files:

• templates/addnode.html (modified) (1 diff)
• templates/node-detail.html (modified) (1 diff)
• templates/node-list.html (modified) (1 diff)
• urls.py (modified) (1 diff)
• views.py (modified) (1 diff)

exodus/templates/addnode.html ¶

@@ -4 +4 @@
 
 <h1>Create a Node</h1>
+<h2><em> {{ message }} </em></h2>
 
 <form method="post" action=".">

exodus/templates/node-detail.html ¶

@@ -11 +11 @@
 
 Master ip: {{ object.masterip }} <br>
-<a href="{% url exodus.views.addNode %}">EDIT</a>
+<a href="{% url exodus.views.editNode  object  %}">EDIT</a>
 </div>
 

exodus/templates/node-list.html ¶

@@ -9 +9 @@
     {% for object in object_list %}
                 <tr>
-                <td class="list" ><a class="list"href=../{{ object.name }}/node/> {{ object.name }} </a><td>
+                <td class="list" ><a class="list"href="{% url node-detail object.name %}">{{ object.name }}</a></td>
             <td><a href="{% url exodus.views.conf_dhcpd_conf object.name %}">dhcpd.conf</a></td>
             <td><a href="{% url exodus.views.conf_named_conf object.name %}">named.conf</a></td>

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"),
-        (r'^(?P<slug>.+)/node/$', 'django.views.generic.list_detail.object_detail', dict(node_dict,slug_field='name',template_name='node-detail.html')),
+        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"),
 
         # config urls
-        (r'^(?P<object_id>.+)/dhcpd.conf$', 'exodus.views.conf_dhcpd_conf'),
-        (r'^(?P<object_id>.+)/named.conf$', 'exodus.views.conf_named_conf'),
-        (r'^(?P<object_id>.+)/rc.node.local$', 'exodus.views.conf_rc_node_local'),
-        (r'^(?P<object_id>.+)/resolv.conf$', 'exodus.views.conf_resolv_conf'),
+        (r'^config/freebsd-5.0/(?P<object_id>.+)/dhcpd.conf$', 'exodus.views.conf_dhcpd_conf'),
+        (r'^config/freebsd-5.0/(?P<object_id>.+)/named.conf$', 'exodus.views.conf_named_conf'),
+        (r'^config/freebsd-5.0/(?P<object_id>.+)/rc.node.local$', 'exodus.views.conf_rc_node_local'),
+        (r'^config/freebsd-5.0/(?P<object_id>.+)/resolv.conf$', 'exodus.views.conf_resolv_conf'),
 
 
         # add urls
-        (r'^addlocation/$', 'exodus.views.addLocation'),
-        (r'^addnode/$', 'exodus.views.addNode'),
-        (r'^addnic/$', 'exodus.views.addInterface'),
-        (r'^addinterlink/$', 'exodus.views.addLink'),
-        (r'^addomni/$', 'exodus.views.addPublicAP'),
+        (r'^add/location/$', 'exodus.views.addLocation'),
+        (r'^add/node/$', 'exodus.views.addNode'),
+        (r'^add/nic/$', 'exodus.views.addInterface'),
+        (r'^add/interlink/$', 'exodus.views.addLink'),
+        (r'^add/omni/$', 'exodus.views.addPublicAP'),
+
+        # add urls
+        (r'^edit/location/(?P<object_id>.+)/$', 'exodus.views.addLocation'),
+        (r'^edit/node/(?P<objectId>.+)/$', 'exodus.views.editNode'),
+        (r'^edit/nic/(?P<object_id>.+)/$', 'exodus.views.addInterface'),
+        (r'^edit/interlink/(?P<object_id>.+)/$', 'exodus.views.addLink'),
+        (r'^edit/omni/(?P<object_id>.+)/$', 'exodus.views.addPublicAP'),
 
         # delete/remove urls
-        (r'^delnode/$', 'exodus.views.delnode'),
+        (r'^delete/node/(?P<object_id>.+)$', 'exodus.views.delnode'),
+        (r'^delete/link/(?P<object_id>.+)$', 'exodus.views.delnode'),
 )
 

exodus/views.py ¶

@@ -42 +42 @@
                         return HttpResponseRedirect("/exodus/")
         else:
-                # XXX: Parse node if found
-                nodeId = request.GET.get('id')
-                try:
-                        node = Node.objects.get(pk=nodeId)
-                        form = AddNodeForm(instance=node)
-                except Node.DoesNotExist:
-#                       newForm = Node(location=Location(pk=1))
-#                       form = AddNodeForm(instance = newForm)
-#                       Also possible
-#                       AddNodeFormSet = formset_factory(AddNodeForm,extra=0)
-#                       formset = AddNodeFormSet(initial=[{'location' : '1'}])
-                        form = AddNodeForm()
+                form = AddNodeForm()
         return render_to_response('addnode.html', {'form': form })
+
+def editNode(request, objectId):
+        node = Node.objects.get(name=objectId)
+        if request.POST:
+                form = AddNodeForm(request.POST, instance=node)
+                if form.is_valid():
+                        form.save()
+                        #Properly redirect to view/<Node> needed
+                        message = 'Node Updated succesfully'
+                        return HttpResponseRedirect("/exodus/")
+                else:
+                        message = 'Form error, please edit and resubmit'
+        else:
+                message = 'Please edit and submit'
+                form = AddNodeForm(instance=node)
+        return render_to_response('addnode.html', {'form': form, 'message' : message })
+
 
 def delnode(request):