Fix the admin for VPNSubscription

It's still not perfect, see comment in the code.

coin/vpn/models.py

@@ -45,11 +45,15 @@ class VPNSubscription(CoinLdapSyncModel):
     administrative_subscription = models.OneToOneField(
         'offers.OfferSubscription',
         related_name='openvpn_ldap',
-        limit_choices_to={
+        # Only consider VPN subscriptions.
-            # Only consider VPN subscription...
+        # TODO: also filter out subscriptions that already have a OneToOne
-            'offer__backend': 'openvpn_ldap',
+        # relation.  Simply adding "'openvpn_ldap': None" to the
-            # ...with no VPNSubscription object associated yet
+        # dictionary does not work well, as it will also remove ourselves
-            'openvpn_ldap': None},
+        # from the list when editing the object in the admin.  Using a Q()
+        # query does not solve the problem, as there is no way to
+        # reference ourselves.  The proper solution would be to create a
+        # custom form.
+        limit_choices_to={'offer__backend': 'openvpn_ldap'},
         validators=[validate_backend_type])
     # TODO: do some access control to prevent the user from changing this field
     activated = models.BooleanField(default=False)