Skip to content
Snippets Groups Projects
Commit 2e6e7c71 authored by Bastien Abadie's avatar Bastien Abadie
Browse files

Merge branch 'dedupe-corpora' into 'master'

Fix duplicated corpora when logged in as a regular user

See merge request !343
parents e5fc16be 0664d861
No related branches found
No related tags found
1 merge request!343Fix duplicated corpora when logged in as a regular user
......@@ -138,7 +138,7 @@ class CorpusManager(models.Manager):
# * public corpus
# * private with ACL
qs = qs.prefetch_related('corpus_right')
qs = qs.filter(models.Q(public=True) | models.Q(corpus_right__user=user))
qs = qs.filter(models.Q(public=True) | models.Q(corpus_right__user=user)).distinct()
return qs
def writable(self, user):
......@@ -153,4 +153,4 @@ class CorpusManager(models.Manager):
return qs.all()
# Authenticated users can write only on corpora with ACL
return qs.filter(corpus_right__user=user, corpus_right__can_write=True)
return qs.filter(corpus_right__user=user, corpus_right__can_write=True).distinct()
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