fix processing with no values
authorMaciej Tronowski <mtro@man.poznan.pl>
Fri, 6 Mar 2015 15:50:05 +0000 (16:50 +0100)
committerMaciej Tronowski <mtro@man.poznan.pl>
Fri, 6 Mar 2015 15:50:05 +0000 (16:50 +0100)
qcg/forms.py
qcg/views.py

index ea08046..f66ada6 100644 (file)
@@ -198,7 +198,7 @@ class JobDescriptionForm(forms.Form):
         return self.cleaned_data['application'].split('/', 1)
 
     def clean_nodes(self):
-        return map(int, self.cleaned_data['nodes'].split(':', 2))
+        return map(int, self.cleaned_data['nodes'].split(':', 2)) if self.cleaned_data['nodes'] else None
 
 
 class EnvForm(forms.Form):
index 53491cc..d1b2880 100644 (file)
@@ -170,10 +170,14 @@ def job_new(request):
                 if form.cleaned_data[name]:
                     setattr(desc, name, form.cleaned_data[name])
 
-            desc.set_application(*form.cleaned_data['application'])
-            desc.set_nodes(*form.cleaned_data['nodes'])
-            desc.set_reservation(form.cleaned_data['reservation'])
-            desc.set_watch_output(form.cleaned_data['watch_output'], form.cleaned_data['watch_output_pattern'])
+            if form.cleaned_data['application']:
+                desc.set_application(*form.cleaned_data['application'])
+            if form.cleaned_data['nodes']:
+                desc.set_nodes(*form.cleaned_data['nodes'])
+            if form.cleaned_data['reservation']:
+                desc.set_reservation(form.cleaned_data['reservation'])
+            if form.cleaned_data['watch_output']:
+                desc.set_watch_output(form.cleaned_data['watch_output'], form.cleaned_data['watch_output_pattern'])
             desc.env_variables += [(env['name'], env['value']) for env in env_formset.cleaned_data if not env['DELETE']]
             # TODO script
             # TODO executable