Commit 5963931c authored by Hervé  MENAGER's avatar Hervé MENAGER
Browse files

Merge branch 'master' into 'release'

Master

See merge request !33
parents 56dea274 2a7590c7
Pipeline #66563 passed with stages
in 21 minutes and 32 seconds
......@@ -96,6 +96,11 @@
name: "postgresql11-server"
state: present
become: true
- name: install PostgreSQL development library
yum:
name: "postgresql-devel"
state: present
become: true
- name: install gettext for compilemessages
yum: name=gettext state=present update_cache=yes
become: true
......
......@@ -329,21 +329,26 @@
Aknowledgments
</div>
<div class="row" style="padding-left: 30px; padding-right: 30px;">
<div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-4 aklgmt_logo"
<div class="col-12 col-sm-12 col-md-12 col-lg-3 col-xl-3 aklgmt_logo"
style="background-image: url('../static/images/Logos/LogoChemaxonCarousel_large.png');">
<a href="https://chemaxon.com/"
style="display:block;width:100%;height:100%;" target="_blank"></a>
</div>
<div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-4 aklgmt_logo"
<div class="col-12 col-sm-12 col-md-12 col-lg-3 col-xl-3 aklgmt_logo"
style="background-image: url('../static/images/Logos/ANRLogo.png');">
<a href="https://anr.fr/" style="display:block;width:100%;height:100%;"
target="_blank"></a>
</div>
<div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-4 aklgmt_logo"
<div class="col-12 col-sm-12 col-md-12 col-lg-3 col-xl-3 aklgmt_logo"
style="background-image: url('../static/images/Logos/LogoBiovia.png');">
<a href="https://www.3ds.com/fr/produits-et-services/biovia/" style="display:block;width:100%;height:100%;"
target="_blank"></a>
</div>
<div class="col-12 col-sm-12 col-md-12 col-lg-3 col-xl-3 aklgmt_logo"
style="background-image: url('../static/images/Logos/logo-inception.png');">
<a href="https://www.inception-program.fr" style="display:block;width:100%;height:100%;"
target="_blank"></a>
</div>
</div>
</div>
......
......@@ -22,8 +22,11 @@ class PdbViewSet(viewsets.ModelViewSet):
@action(detail=True, methods=["get"])
def get_queryset(self):
code = self.request.GET.get("code")
if "pk" in self.kwargs:
queryset = PDB.objects.filter(pk=self.kwargs["pk"])
elif code:
queryset = PDB.objects.filter(code=code)
else:
queryset = PDB.objects.all().values("code", "id")
return queryset
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment