Skip to content
Snippets Groups Projects
Commit 938195ac authored by Jonathan Seguin's avatar Jonathan Seguin
Browse files

Hotfix for servlet upload

parent 766433be
No related branches found
No related tags found
No related merge requests found
......@@ -192,24 +192,28 @@ class DataFileServletUploadForm(forms.ModelForm):
self.fields['dataset'].queryset = DataSet.objects.accessible_to_profile(request.user.profile).all()
def clean(self):
dataset = self.data['dataset']
super().clean()
if 'dataset' in self._errors:
# handle this manually in clean_dataset
del self._errors['dataset']
cleaned_data = self.cleaned_data
return self.cleaned_data
if dataset:
# Allow specifying dataset with iric-data ID
def clean_dataset(self):
# Allow specifying dataset with iric-data ID
dataset = self.cleaned_data['dataset']
if 'dataset' in self.cleaned_data:
dataset = self.cleaned_data['dataset']
if isinstance(dataset, str) and dataset[:2] == 'DS':
dataset = DataSet.objects.get(iric_data_id=dataset)
if 'dataset' in self._errors:
del self._errors['dataset']
if not isinstance(dataset, DataSet):
raise forms.ValidationError("Error fetching dataset")
if isinstance(dataset, str) and dataset[:2] == 'DS':
dataset = DataSet.objects.filter(iric_data_id=dataset).first()
return dataset
if not isinstance(dataset, DataSet):
self.add_error('dataset', forms.ValidationError("Error fetching dataset"))
cleaned_data['dataset'] = dataset
return cleaned_data
class DataFileAnnotationForm(forms.Form):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment