Changeset 6323 for trunk

Timestamp:

Oct 2, 2008, 7:54:36 AM (16 years ago)

Author:

RIck van der Zwet

Message:

Took my changes and as part of DRY principe created a 'global' framework to be
used by other forms/templates as the workflow for every form is the same anyway

Location:

trunk/exodus

Files:

• models.py (modified) (2 diffs)
• views.py (modified) (2 diffs)

trunk/exodus/models.py

@@ -33 +33 @@
     class Meta:
         abstract = True
+        verbose_name = 'ExtendedModel'
 
     def as_list(self):
@@ -132 +133 @@
     desc = models.CharField(max_length=100)
 
+    class Meta:
+        verbose_name = "Public Access Point"
+
     def __str__(self):
         return "%s:%s" % (self.iface,self.pk)

trunk/exodus/views.py

@@ -3 +3 @@
 from django.db import models
 from django.http import HttpResponse, HttpResponseRedirect
-from django.template import loader, Context 
+from django.template import Context, loader
 from django.shortcuts import render_to_response
 from django.core.urlresolvers import reverse
@@ -209 +209 @@
                 exclude = ('shortdesc', 'desc', 'ip', 'dhcpstart', 'dhcpstop')
 
+class GenericHandler():
+        """Conventions used: type has to to the same name as the dependency object, delet template is named delete<type>.html"""
+        def __init__(self, request, node, interface, publicAP, mode, type):
+                # Find dependencies
+                node = Node.objects.get(name=node)
+                iface = Interface.objects.get(node=node, iface=interface)
+                publicAP = PublicAP(iface=iface) if mode == 'add' else PublicAP.objects.get(iface=iface, pk=publicAP)
+                
+                delInclude = 'delete' + type + '.html'
+                
+                formClass = eval(type + 'Form')
+                self.object = eval(type[0].lower() + type[1::])
+                title = self.object._meta.verbose_name
+                
+                if request.POST.has_key('cancel'):
+                        self.response = HttpResponseRedirect(reverse('node-detail', args=[node]))
+                elif request.POST.has_key('proceed'):
+                        if mode == 'delete':
+                                self._delete()
+                                self.response = HttpResponseRedirect(reverse('node-detail', args=[node]))
+                        else:
+                                # First checking whether form is valid, then add/edit actions
+                                self.form = formClass(request.POST, instance=self.object)
+                                if self.form.is_valid():
+                                        if mode == 'add':
+                                                self._add()
+                                        elif mode == 'edit':
+                                                self._edit()
+                                        self.response = HttpResponseRedirect(reverse('node-detail', args=[node]))
+                                else:
+                                        message = 'Form error, please edit and resubmit'
+                                        self.response = render_to_response('genericForm.html', {'form': self.form,
+                                                'message' : message, 'title' : title, 'mode' : mode,
+                                                'delInclude' : delInclude, 'object': self.object })
+                else:
+                        message = 'Please edit and submit'
+                        self.form = formClass(instance=self.object)
+                        self.response = render_to_response('genericForm.html', {'form': self.form,
+                                'message' : message, 'title' : title, 'mode' : mode,
+                                'delInclude' : delInclude, 'object': self.object })
+
+        def _add(self):
+                _instance = self.form.save(commit=False)
+                # Find IP range inside interface range with disired size/subnet
+                _instance.ip = freePublicAPIP(_instance.iface, _instance.netmask)
+                _instance.dhcpstart = 1
+                _instance.dhcpstop = 2
+                # If wireless generate ssid name
+                _instance.ssid = newSSIDName(_instance.iface.node, _instance.iface, 'omni')
+                _instance.save()
+
+        def _edit(self):
+                self.form.save()
+
+        def _delete(self):
+                self.object.delete()
+        
+        def render_to_response(self):
+                return self.response
+
 def genericPublicAP(request, node, interface, publicAP, mode):
-        # Find dependencies
-        node = Node.objects.get(name=node)
-        iface = Interface.objects.get(node=node, iface=interface)
-        publicAP = PublicAP(iface=iface) if mode == 'add' else PublicAP.objects.get(iface=iface, pk=publicAP)
-        
-        title = 'Public access point'
-        delInclude = 'deletePublicAP.html'
-        
-        if request.POST.has_key('cancel'):
-                return HttpResponseRedirect(reverse('node-detail', args=[node]))
-        elif request.POST.has_key('proceed'):
-                if mode == 'delete':
-                        publicAP.delete()
-                        return HttpResponseRedirect(reverse('node-detail', args=[node]))
-        
-                # First checking whether form is valid, then add/edit actions
-                form = PublicAPForm(request.POST, instance=publicAP)
-                if form.is_valid():
-                        if mode == 'add':
-                                instance = form.save(commit=False)
-                                # Find IP range inside interface range with disired size/subnet
-                                instance.ip = freePublicAPIP(instance.iface, instance.netmask)
-                                instance.dhcpstart = 1
-                                instance.dhcpstop = 2
-                                # If wireless generate ssid name
-                                instance.ssid = newSSIDName(instance.iface.node, instance.iface, 'omni')
-                                instance.save()
-                        elif mode == 'edit':
-                                form.save()
-                        return HttpResponseRedirect(reverse('node-detail', args=[node]))
-                else:
-                        message = 'Form error, please edit and resubmit'
-        else:
-                message = 'Please edit and submit'
-                form = PublicAPForm(instance=publicAP)
-        
-        return render_to_response('genericForm.html', {'form': form,
-                'message' : message, 'title' : title, 'mode' : mode,
-                'delInclude' : delInclude, 'object': publicAP })
+        handler = GenericHandler(request, node, interface, publicAP, mode, 'PublicAP')
+        return handler.render_to_response()
 
 def nodename2id(node):