diff --git a/Makefile b/Makefile index b48468e635..c4a024b05d 100644 --- a/Makefile +++ b/Makefile @@ -44,18 +44,18 @@ css: %.pdf: mkdir -p docs/data-model - postgresql_autodoc -h localhost -u geotrek -d geotrekdb -t dot -m "$*_.*" + postgresql_autodoc -h localhost -u geotrek -d geotrekdb -t dot -m "$*_.*" --password=geotrek -s "public" dot geotrekdb.dot -T pdf -o docs/data-model/$@ rm geotrekdb.dot authent.pdf: mkdir -p docs/data-model - postgresql_autodoc -h localhost -u geotrek -d geotrekdb -t dot -m "auth(ent)?_.*" + postgresql_autodoc -h localhost -u geotrek -d geotrekdb -t dot -m "auth(ent)?_.*" --password=geotrek -s "public" dot geotrekdb.dot -T pdf -o docs/data-model/authent.pdf rm geotrekdb.dot global.pdf: - postgresql_autodoc -h localhost -u geotrek -d geotrekdb -t dot + postgresql_autodoc -h localhost -u geotrek -d geotrekdb -t dot --password=geotrek -s "public" dot geotrekdb.dot -T pdf -o docs/data-model/global.pdf rm geotrekdb.dot diff --git a/docs/data-model/authent.pdf b/docs/data-model/authent.pdf index 2d7f555c80..b56118e77f 100644 Binary files a/docs/data-model/authent.pdf and b/docs/data-model/authent.pdf differ diff --git a/docs/data-model/cirkwi.pdf b/docs/data-model/cirkwi.pdf index bf185293c9..e1619dcd7e 100644 Binary files a/docs/data-model/cirkwi.pdf and b/docs/data-model/cirkwi.pdf differ diff --git a/docs/data-model/core.pdf b/docs/data-model/core.pdf index da77c14c20..de682a5f7f 100644 Binary files a/docs/data-model/core.pdf and b/docs/data-model/core.pdf differ diff --git a/docs/data-model/diving.pdf b/docs/data-model/diving.pdf index be59de3946..82ef1027b6 100644 Binary files a/docs/data-model/diving.pdf and b/docs/data-model/diving.pdf differ diff --git a/docs/data-model/feedback.pdf b/docs/data-model/feedback.pdf index 0acb94efde..efab676bdb 100644 Binary files a/docs/data-model/feedback.pdf and b/docs/data-model/feedback.pdf differ diff --git a/docs/data-model/flatpages.pdf b/docs/data-model/flatpages.pdf index 5cb8b2d8f0..bfab81c446 100644 Binary files a/docs/data-model/flatpages.pdf and b/docs/data-model/flatpages.pdf differ diff --git a/docs/data-model/global.pdf b/docs/data-model/global.pdf index dc0e8fceee..a92d17b931 100644 Binary files a/docs/data-model/global.pdf and b/docs/data-model/global.pdf differ diff --git a/docs/data-model/infrastructure.pdf b/docs/data-model/infrastructure.pdf index dbaf9fb88c..8658692ad8 100644 Binary files a/docs/data-model/infrastructure.pdf and b/docs/data-model/infrastructure.pdf differ diff --git a/docs/data-model/land.pdf b/docs/data-model/land.pdf index e5f201aa71..be33714f0b 100644 Binary files a/docs/data-model/land.pdf and b/docs/data-model/land.pdf differ diff --git a/docs/data-model/maintenance.pdf b/docs/data-model/maintenance.pdf index 79241ce4ae..e839c94956 100644 Binary files a/docs/data-model/maintenance.pdf and b/docs/data-model/maintenance.pdf differ diff --git a/docs/data-model/outdoor.pdf b/docs/data-model/outdoor.pdf index 5f03a209bb..92a6b23f45 100644 Binary files a/docs/data-model/outdoor.pdf and b/docs/data-model/outdoor.pdf differ diff --git a/docs/data-model/sensitivity.pdf b/docs/data-model/sensitivity.pdf index 5aff859683..174526abdf 100644 Binary files a/docs/data-model/sensitivity.pdf and b/docs/data-model/sensitivity.pdf differ diff --git a/docs/data-model/signage.pdf b/docs/data-model/signage.pdf index 3dda58bbb3..67ac8e598e 100644 Binary files a/docs/data-model/signage.pdf and b/docs/data-model/signage.pdf differ diff --git a/docs/data-model/tourism.pdf b/docs/data-model/tourism.pdf index bcaa3951f7..a9e968b704 100644 Binary files a/docs/data-model/tourism.pdf and b/docs/data-model/tourism.pdf differ diff --git a/docs/data-model/trekking.pdf b/docs/data-model/trekking.pdf index 1795aaec80..8a1b8199ac 100644 Binary files a/docs/data-model/trekking.pdf and b/docs/data-model/trekking.pdf differ diff --git a/docs/data-model/zoning.pdf b/docs/data-model/zoning.pdf index 50cf179333..9168b53835 100644 Binary files a/docs/data-model/zoning.pdf and b/docs/data-model/zoning.pdf differ diff --git a/geotrek/outdoor/migrations/0025_merge_ratings_min_max.py b/geotrek/outdoor/migrations/0025_merge_ratings_min_max.py index 5ffcc6211a..3cd5630454 100644 --- a/geotrek/outdoor/migrations/0025_merge_ratings_min_max.py +++ b/geotrek/outdoor/migrations/0025_merge_ratings_min_max.py @@ -1,11 +1,9 @@ # Generated by Célia 23.8 on 2021-09-15 15:12 -from django.apps import apps - from django.db import migrations -def merge_ratings_min_max(app, schema): +def merge_ratings_min_max(apps, schema): site_model = apps.get_model('outdoor', 'Site') sites = site_model.objects.all() for site in sites: diff --git a/geotrek/outdoor/migrations/0027_merge_ratings.py b/geotrek/outdoor/migrations/0027_merge_ratings.py index 60f97d6fed..c265f29d22 100644 --- a/geotrek/outdoor/migrations/0027_merge_ratings.py +++ b/geotrek/outdoor/migrations/0027_merge_ratings.py @@ -1,11 +1,9 @@ # Generated by Célia 23.8 on 2021-09-15 15:12 -from django.apps import apps - from django.db import migrations -def merge_ratings(app, schema): +def merge_ratings(apps, schema): site_model = apps.get_model('outdoor', 'Site') sites = site_model.objects.all() for site in sites: @@ -15,7 +13,7 @@ def merge_ratings(app, schema): site.ratings_min.clear() -def reverse_merge_ratings(app, schema): +def reverse_merge_ratings(apps, schema): site_model = apps.get_model('outdoor', 'Site') sites = site_model.objects.all() for site in sites: