Flask admin et suppression table bib_noms

.flaskenv

@@ -1,4 +1,3 @@
 FLASK_APP=apptax.app:create_app
 FLASK_ENV=development
-FLASK_DEBUG=1
-TAXHUB_SETTINGS=config.py
+FLASK_DEBUG=1 

.gitattributes

@@ -0,0 +1,3 @@
+docs/images/*.gif filter=lfs diff=lfs merge=lfs -text
+docs/images/*.jpg filter=lfs diff=lfs merge=lfs -text
+docs/images/*.png filter=lfs diff=lfs merge=lfs -text

.github/workflows/pytest.yml

@@ -10,7 +10,7 @@ on:
     branches:
       - master
       - hotfixes
-      - develop
+      - develop 
 
 jobs:
   build:
@@ -84,22 +84,22 @@ jobs:
     - name: Install database
       run: |
         flask db upgrade taxhub@head -x local-srid=2154
-        flask db upgrade taxhub-admin@head
+        flask db upgrade taxhub-standalone@head
         flask db upgrade ref_geo_fr_departments@head
         flask db autoupgrade
         flask db status
       env:
-        TAXHUB_SETTINGS: test_config.py
+        TAXHUB_CONFIG_FILE: config/test_config.toml
     - name: Install taxref
       run: |
         flask taxref import-v17
       env:
-        TAXHUB_SETTINGS: test_config.py
+        TAXHUB_CONFIG_FILE: config/test_config.toml
     - name: Test with pytest
       run: |
         pytest -v --cov --cov-report xml
       env:
-        TAXHUB_SETTINGS: test_config.py
+        TAXHUB_CONFIG_FILE: config/test_config.toml
     - name: Upload coverage to Codecov
       if: ${{ matrix.name == '11' && matrix.sqlalchemy-version == '1.4' }}
       uses: codecov/codecov-action@v3

.gitignore

@@ -1,9 +1,11 @@
 *~
 
+static/medias/*
+
+node_modules
 #taxhub app
 settings.ini
-venv
-config.py
+venv 
 .vscode
 
 # Byte-compiled / optimized / DLL files
@@ -78,4 +80,4 @@ target/
 
 /docs/changelog.html
 
-/apptax/*_config.py
+config/*_config.toml

README.rst

@@ -50,10 +50,8 @@ Elle est centralisée dans l'application `UsersHub <https://github.com/PnX-SI/Us
 
 Niveaux de droits :
 
-* 2 = Gestion des médias uniquement
-* 3 = Idem 2 + Gestion des attributs de `GeoNature-atlas <https://github.com/PnEcrins/GeoNature-atlas>`_
-* 4 = Idem 3 + Possibilité d'ajouter des taxons dans ``bib_noms``, de les mettre dans des listes et de renseigner tous leurs attributs (notamment ceux utilisés par `GeoNature <https://github.com/PnX-SI/GeoNature>`_)
-* 6 = Administrateurs
+* 2 = Gestion des taxons (ajout/modification/suppression des attributs, liste et médias sur les taxons)
+* 6 = Administrateurs: création de liste, attributs et thême
 
 Auteurs
 -------

apptax/__init__.py

@@ -0,0 +1,8 @@
+taxhub_api_routes = [
+    ("apptax.taxonomie.routesbibnoms:adresses", "/bibnoms"),
+    ("apptax.taxonomie.routestaxref:adresses", "/taxref"),
+    ("apptax.taxonomie.routesbibattributs:adresses", "/bibattributs"),
+    ("apptax.taxonomie.routesbiblistes:adresses", "/biblistes"),
+    ("apptax.taxonomie.routestmedias:adresses", "/tmedias"),
+    ("apptax.taxonomie.routesbdcstatuts:adresses", "/bdc_statuts"),
+]

apptax/admin/admin.py

@@ -0,0 +1,89 @@
+import os
+
+from flask import redirect, url_for, Blueprint
+from flask_admin import Admin, AdminIndexView, expose
+from werkzeug.exceptions import Unauthorized
+
+from apptax.database import db
+from apptax.taxonomie.models import Taxref, BibListes, TMedias, BibAttributs, BibThemes
+
+
+# Create blueprint for template and static
+adresses = Blueprint("apptax-admin", __name__, template_folder="templates")
+adresses.static_folder = os.path.join(adresses.root_path, "static")
+
+
+class TaxhubView(AdminIndexView):
+    def is_visible(self):
+        # This view won't appear in the menu structure
+        return False
+
+    @expose("/")
+    def index(self):
+        return redirect(url_for("taxons.index_view"))
+
+
+taxhub_admin = Admin(
+    template_mode="bootstrap4", name="Administration Taxhub", index_view=TaxhubView(url="/")
+)
+
+
+def taxhub_admin_addview(app, admin, category=None):
+    with app.app_context():
+        from apptax.admin.admin_view import (
+            TaxrefView,
+            BibListesView,
+            TMediasView,
+            BibAttributsView,
+            LoginView,
+            BibThemesView,
+        )
+
+        static_folder = os.path.join(adresses.root_path, "static")
+        admin.add_view(
+            LoginView(
+                name="Login", endpoint="loginview", category=category, static_folder=static_folder
+            )
+        )
+        admin.add_view(
+            TaxrefView(
+                Taxref,
+                db.session,
+                name="Taxref",
+                endpoint="taxons",
+                category=category,
+                static_folder=static_folder,
+            )
+        )
+        admin.add_view(
+            BibListesView(
+                BibListes,
+                db.session,
+                name="Listes",
+                category=category,
+                static_folder=static_folder,
+            )
+        )
+        admin.add_view(
+            TMediasView(
+                TMedias, db.session, name="Médias", category=category, static_folder=static_folder
+            )
+        )
+        admin.add_view(
+            BibAttributsView(
+                BibAttributs,
+                db.session,
+                name="Attributs",
+                category=category,
+                static_folder=static_folder,
+            )
+        )
+        admin.add_view(
+            BibThemesView(
+                BibThemes,
+                db.session,
+                name="Thèmes",
+                category=category,
+                static_folder=static_folder,
+            )
+        )