From: Guillaume Pellerin Date: Mon, 5 Dec 2016 17:15:37 +0000 (+0100) Subject: Use organization.order for content sorting X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=27af413e52b258e6c5789d6221f20302f1e6b3ca;p=mezzo.git Use organization.order for content sorting --- diff --git a/app/organization/core/context_processors.py b/app/organization/core/context_processors.py index 6b44d4d5..b5b3ad5e 100644 --- a/app/organization/core/context_processors.py +++ b/app/organization/core/context_processors.py @@ -17,8 +17,8 @@ def settings(request): # HOST ORGANIZATION host_organization = Organization.objects.get(is_host=True) - linked_organizations_content = host_organization.organizations_content.filter(organizations_content__id=host_organization.id).order_by('organizations_content__id') - linked_organizations_footer = host_organization.organizations_footer.filter(organizations_footer__id=host_organization.id).order_by('organizations_footer__id') + linked_organizations_content = host_organization.organizations_content.filter(organizations_content__id=host_organization.id).order_by('organizations_content__order') + linked_organizations_footer = host_organization.organizations_footer.filter(organizations_footer__id=host_organization.id).order_by('organizations_footer__order') research_slug = "recherche" return {'CURRENT_SEASON': CURRENT_SEASON, diff --git a/bin/build_front.sh b/bin/build_front.sh index bdd06791..6cf2d1af 100755 --- a/bin/build_front.sh +++ b/bin/build_front.sh @@ -1,3 +1,4 @@ #!/bin/sh docker-compose run app bash -c "cd /srv && bower --allow-root install && gulp build" +docker-compose run app python /srv/app/manage.py collectstatic --no-input