commit b143dfc96fe861d3f87cd972f392272cc16ca376
author Jeremy Mowery <jermowery@email.arizona.edu> Mon Jan 11 22:17:06 2016 -0700
committer Jeremy Mowery <jermowery@email.arizona.edu> Mon Jan 11 22:17:06 2016 -0700
tree 48d52a4446a31964eeee001bd3c10133152861b3
parent 7bae05ec23a6fc6b07e40d8b9b6c4e0eff785e6d

Another attempt at getting the VPN form to work

xos/services/vpn/admin.py

diff --git a/xos/services/vpn/admin.py b/xos/services/vpn/admin.py
index 708e3e7..3627e80 100644
--- a/xos/services/vpn/admin.py
+++ b/xos/services/vpn/admin.py
@@ -62,7 +62,7 @@
     client_address = forms.GenericIPAddressField(
         protocol='IPv4', required=True)
     is_persistent = forms.BooleanField(required=False)
-    script_name = forms.CharField(required=False)
+    script_name = forms.CharField(required=True)
     can_view_subnet = forms.BooleanField(required=False)
 
 
@@ -70,7 +70,7 @@
         super(VPNTenantForm, self).__init__(*args, **kwargs)
         self.fields['kind'].widget.attrs['readonly'] = True
         self.fields['server_key'].widget.attrs['readonly'] = True
-        self.fields['script_name'].widget.attrs['readonly'] = True
+        # self.fields['script_name'].widget.attrs['readonly'] = True
         self.fields[
             'provider_service'].queryset = VPNService.get_service_objects().all()
 
@@ -107,16 +107,12 @@
         self.instance.client_address = self.cleaned_data.get("client_address")
         self.instance.is_persistent = self.cleaned_data.get('is_persistent')
         self.instance.script_name = self.clean_script_name()
+        if self.instance.script_name == None:
+            raise forms.ValidationError("Script name is None, despite that not making any sense")
         self.instance.can_view_subnet = self.cleaned_data.get(
             'can_view_subnet')
         return super(VPNTenantForm, self).save(commit=commit)
 
-    def clean_script_name(self):
-        data = self.cleaned_data.get('script_name')
-        if data == None:
-            raise forms.ValidationError("Script name is None, despite that not making any sense")
-        return data
-
     def generate_VPN_key(self):
         """str: Generates a VPN key using the openvpn command."""
         proc = Popen("openvpn --genkey --secret /dev/stdout",