Allow editing VPN parameters

Conflicts:
	coin/vpn/models.py

coin/vpn/models.py

@@ -2,6 +2,7 @@
 from django.db import models
 from django.core.exceptions import ValidationError
 from django.conf import settings
+from django.core.urlresolvers import reverse
 from netfields import InetAddressField, NetManager
 import ldapdb.models
 from ldapdb.models.fields import CharField, ListField
@@ -33,6 +34,9 @@ class VPNConfiguration(CoinLdapSyncMixin, Configuration):
 
     objects = NetManager()
 
+    def get_absolute_url(self):
+        return reverse('vpn:openvpn_ldap', args=[str(self.pk)])
+
     # These two methods are part of the general configuration interface.
     def save_subnet(self, subnet, creation):
         self.check_endpoints(delete=True)

coin/vpn/templates/vpn/vpn.html

@@ -7,6 +7,7 @@
     <div class="large-6 columns">
         <div class="panel">
             <h3>Statut</h3>
+            <form action="{{ object.get_absolute_url }}" method="post">{% csrf_token %}
             <table class="full-width">
                 <tr>
                     <td class="center"><span class="label">Identifiant</span></td>
@@ -20,7 +21,7 @@
                 </tr>
                 {% endblock %}<tr class="flatfield">
                     <td class="center"><span class="label">Commentaire</span></td>
-                    <td><input type="text" value="{{object.comment}}" /></td>
+                    <td>{{ form.comment }}</td>
                 </tr>
                 <tr>
                     <td class="center boolviewer" colspan="2">
@@ -28,6 +29,7 @@
                         <span>Ce VPN est {% if object.activated %}activé{% else %}désactivé{% endif %}</span>
                     </td>
                 </tr>
+                <tr><td class="center" colspan="2"><input type="submit" value="Valider" /></td></tr>
             </table>
         </div>
     </div>
@@ -36,13 +38,14 @@
         <div class="panel">
             <h3>Adresses IP</h3>
             <table class="full-width">
+              {{ form.non_field_errors }}
                 <tr class="flatfield">
                     <td class="center"><span class="label">IPv4</span></td>
-                    <td><input type="text" name="endpoint4" {% if object.ipv4_endpoint %}value="{{ object.ipv4_endpoint }}" {% endif %} placeholder="Aucune adresse"/></td>
+                    <td>{{ form.ipv4_endpoint }} {{ form.ipv4_endpoint.errors }}</td>
                 </tr>
                 <tr class="flatfield">
                     <td class="center"><span class="label">IPv6</span></td>
-                    <td><input type="text" name="endpoint6" {% if object.ipv6_endpoint %}value="{{ object.ipv6_endpoint }}" {% endif %} placeholder="Aucune adresse"/></td>
+                    <td>{{ form.ipv6_endpoint }} {{ form.ipv6_endpoint.errors }}</td>
                 </tr>
                 <tr>
                     <td class="center"><span class="label">Sous-réseaux</span></td>
@@ -50,9 +53,11 @@
                         {% for subnet in object.administrative_subscription.ip_subnet.all %}{{ subnet }}<br/>{% endfor %}
                     </td>
                 </tr>
+              <tr><td class="center" colspan="2"><input type="submit" value="Valider" /></td></tr>
             </table>
         </div>
     </div>
+    </form>
 </div>
 
 <div class="row">

coin/vpn/views.py

@@ -4,6 +4,7 @@ from urllib2 import urlopen
 from django.http import StreamingHttpResponse
 from django.shortcuts import render_to_response, get_object_or_404
 from django.views.generic.detail import DetailView
+from django.views.generic.edit import UpdateView
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.utils.decorators import method_decorator
@@ -12,7 +13,9 @@ from coin.members.models import Member
 from coin.vpn.models import VPNConfiguration
 
 
-class VPNView(DetailView):
+class VPNView(UpdateView):
+    model = VPNSubscription
+    fields = ['ipv4_endpoint', 'ipv6_endpoint', 'comment']
 
     @method_decorator(login_required)
     def dispatch(self, *args, **kwargs):