Use organization.order for content sorting

diff --git a/app/organization/core/context_processors.py b/app/organization/core/context_processors.py
index 6b44d4d55936262752fad131daacc54e08f1f9bd..b5b3ad5ee4a786cde8999cc99b6e4eed60c2ecac 100644 (file)
--- 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 bdd06791234b1ead8e00a48538269eebeaca9168..6cf2d1af0f965de6444a9076765f8fc6c0bde878 100755 (executable)
--- 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