Merge branch 'dev' into 'master'

Populate /secure/my-sharegroups/ with the same groups that are available to a...

See merge request !111

portal/forms.py

@@ -210,7 +210,10 @@ class DataFileServletUploadForm(forms.ModelForm):
             self.fields['dataset'].queryset = DataSet.objects.accessible_to_profile(request.user.profile).all()
 
     def clean(self):
-        dataset = self.data['dataset']
+        if 'dataset' in self.data:
+            dataset = self.data['dataset']
+        else:
+            dataset = None
         super().clean()
         cleaned_data = self.cleaned_data
 

portal/graphql_schema.py

@@ -90,8 +90,6 @@ class Query(graphene.ObjectType):
     dataset = graphene.Field(DataSetType, id=graphene.String(), dbid=graphene.ID())
     datafiles = graphene.List(
         DataFileType,
-        key=graphene.String(),
-        value=graphene.String(),
         key_values=graphene.JSONString(),
         keys=graphene.List(graphene.String),
         values=graphene.List(graphene.String),