Skip to content
Snippets Groups Projects
Commit 81aff678 authored by Jean-Philippe Laverdure's avatar Jean-Philippe Laverdure
Browse files

Merge branch 'dev' into 'master'

Dev

See merge request !106
parents 734eb75c f3d75642
No related branches found
No related tags found
1 merge request!106Dev
......@@ -4,7 +4,7 @@
A DataFile is owned by a user and must be linked to a laboratory. The DataFile and his annotations can only be modified by his owner, the PI or data manager of the laboratory.
PI and data manager have access to every files related to thier laboratory.
PI and data manager have access to every files related to their laboratory.
## DataSet
......
......@@ -89,11 +89,18 @@ class Query(graphene.ObjectType):
in_id_list=graphene.List(graphene.String)
)
datasets = graphene.List(DataSetType, in_id_list=graphene.List(graphene.String))
lab = graphene.Field(LabType, name=graphene.String(), dbid=graphene.ID())
lab = graphene.Field(
LabType,
name=graphene.String(),
dbid=graphene.ID()
)
labs = graphene.List(
LabType,
in_name_list=graphene.List(graphene.String)
)
my_profile = graphene.Field(
ProfileType
)
profiles = graphene.List(
ProfileType,
in_email_list=graphene.List(graphene.String)
......@@ -190,6 +197,9 @@ class Query(graphene.ObjectType):
return qs.distinct()
def resolve_my_profile(self, info, **kwargs):
return Profile.objects.get(user=info.context.user)
def resolve_profiles(self, info, **kwargs):
email_list = kwargs.get('in_email_list')
qs = Profile.objects.all()
......
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