hide no items info on error

[qcg-portal.git] / qcg / forms.py

diff --git a/qcg/forms.py b/qcg/forms.py
index 3450783..f66ada6 100644 (file)
--- a/qcg/forms.py
+++ b/qcg/forms.py
@@ -153,7 +153,7 @@ class JobDescriptionForm(forms.Form):
     preprocess_cmd = forms.CharField(label=u"Polecenie", max_length=1000, required=False)
     preprocess_script = forms.CharField(label=u"Skrypt", max_length=500, required=False)  # TODO grid ftp
     postprocess_type = forms.ChoiceField(label=u"Postprocessing", choices=Process.CHOICES, required=False,
-                                         initial=Process.CHOICES, widget=forms.RadioSelect)
+                                         initial=Process.NONE, widget=forms.RadioSelect)
     postprocess_cmd = forms.CharField(label=u"Polecenie", max_length=1000, required=False)
     postprocess_script = forms.CharField(label=u"Skrypt", max_length=500, required=False)  # TODO grid ftp
     native = forms.MultipleChoiceField(label=u"Opcje systemu kolejkowego", required=False)
@@ -195,21 +195,10 @@ class JobDescriptionForm(forms.Form):
             data['postprocess'] = ''
 
     def clean_application(self):
-        value = self.cleaned_data['application']
-
-        if '/' in value:
-            return value.split('/', 1)
-
-        return value, None
+        return self.cleaned_data['application'].split('/', 1)
 
     def clean_nodes(self):
-        value = map(int, self.cleaned_data['nodes'].split(':', 2))
-
-        if len(value) == 3:
-            return tuple(value)
-
-        nodes, slots = value
-        return nodes, slots, slots
+        return map(int, self.cleaned_data['nodes'].split(':', 2)) if self.cleaned_data['nodes'] else None
 
 
 class EnvForm(forms.Form):