c2cgeoportal-admin 2.7.1.156__py3-none-any.whl → 2.8.1.87__py3-none-any.whl

c2cgeoportal_admin/views/ogc_servers.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2021, Camptocamp SA
+# Copyright (c) 2017-2023, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -26,29 +26,36 @@
 # either expressed or implied, of the FreeBSD Project.
 
 
+import logging
+import threading
 from functools import partial
-from typing import Any, Dict, List, cast
+from typing import Any, Dict, List, Union, cast
 
+import requests
 from c2cgeoform.schema import GeoFormSchemaNode
 from c2cgeoform.views.abstract_views import AbstractViews, ItemAction, ListField, UserMessage
 from deform.widget import FormWidget
-from pyramid.httpexceptions import HTTPNotFound
+from pyramid.httpexceptions import HTTPFound
 from pyramid.view import view_config, view_defaults
 from sqlalchemy import inspect
 
 from c2cgeoportal_admin import _
 from c2cgeoportal_admin.lib.ogcserver_synchronizer import OGCServerSynchronizer
+from c2cgeoportal_admin.views.logged_views import LoggedViews
 from c2cgeoportal_commons.lib.literal import Literal
-from c2cgeoportal_commons.models.main import OGCServer
+from c2cgeoportal_commons.models import cache_invalidate_cb
+from c2cgeoportal_commons.models.main import LogAction, OGCServer
 
 _list_field = partial(ListField, OGCServer)
 
 base_schema = GeoFormSchemaNode(OGCServer, widget=FormWidget(fields_template="ogcserver_fields"))
 base_schema.add_unique_validator(OGCServer.name, OGCServer.id)
 
+LOG = logging.getLogger(__name__)
+
 
 @view_defaults(match_param="table=ogc_servers")
-class OGCServerViews(AbstractViews):  # type: ignore
+class OGCServerViews(LoggedViews):
     """The OGC server administration view."""
 
     _list_fields = [
@@ -84,10 +91,7 @@ class OGCServerViews(AbstractViews):  # type: ignore
         return super().grid()  # type: ignore
 
     def schema(self) -> GeoFormSchemaNode:
-        try:
-            obj = self._get_object()
-        except HTTPNotFound:
-            obj = None
+        obj = self._get_object()
 
         schema = self._base_schema.clone()
         schema["url"].description = Literal(
@@ -107,6 +111,22 @@ class OGCServerViews(AbstractViews):  # type: ignore
     def _item_actions(self, item: OGCServer, readonly: bool = False) -> List[Any]:
         actions = cast(List[Any], super()._item_actions(item, readonly))
         if inspect(item).persistent:
+            actions.insert(
+                next((i for i, v in enumerate(actions) if v.name() == "delete")),
+                ItemAction(
+                    name="clear-cache",
+                    label=_("Clear the cache"),
+                    icon="glyphicon glyphicon-hdd",
+                    url=self._request.route_url(
+                        "ogc_server_clear_cache",
+                        id=getattr(item, self._id_field),
+                        _query={
+                            "came_from": self._request.current_route_url(),
+                        },
+                    ),
+                    confirmation=_("The current changes will be lost."),
+                ),
+            )
             actions.insert(
                 next((i for i, v in enumerate(actions) if v.name() == "delete")),
                 ItemAction(
@@ -127,8 +147,11 @@ class OGCServerViews(AbstractViews):  # type: ignore
     @view_config(  # type: ignore
         route_name="c2cgeoform_item", request_method="POST", renderer="../templates/edit.jinja2"
     )
-    def save(self) -> Dict[str, Any]:
-        return super().save()  # type: ignore
+    def save(self) -> Union[HTTPFound, Dict[str, Any]]:
+        result: Union[HTTPFound, Dict[str, Any]] = super().save()
+        if isinstance(result, HTTPFound):
+            self._update_cache(self._obj)
+        return result
 
     @view_config(route_name="c2cgeoform_item", request_method="DELETE", renderer="fast_json")  # type: ignore
     def delete(self) -> Dict[str, Any]:
@@ -143,7 +166,9 @@ class OGCServerViews(AbstractViews):  # type: ignore
                     _query=[("msg_col", "cannot_delete")],
                 ),
             }
-        return super().delete()  # type: ignore
+        result: Dict[str, Any] = super().delete()
+        cache_invalidate_cb()
+        return result
 
     @view_config(  # type: ignore
         route_name="c2cgeoform_item_duplicate", request_method="GET", renderer="../templates/edit.jinja2"
@@ -176,16 +201,45 @@ class OGCServerViews(AbstractViews):  # type: ignore
                 force_ordering=force_ordering,
                 clean=clean,
             )
+
             if "check" in self._request.params:
                 synchronizer.check_layers()
+
             elif "dry-run" in self._request.params:
                 synchronizer.synchronize(dry_run=True)
+
             elif "synchronize" in self._request.params:
                 synchronizer.synchronize()
+
+                self._create_log(LogAction.SYNCHRONIZE, obj)
+
             return {
                 "ogcserver": obj,
                 "success": True,
                 "report": synchronizer.report(),
             }
 
+        self._update_cache(obj)
+
         return {}
+
+    def _update_cache(self, ogc_server: OGCServer) -> None:
+        try:
+            ogc_server_id = ogc_server.id
+
+            def update_cache() -> None:
+                response = requests.get(
+                    self._request.route_url(
+                        "ogc_server_clear_cache",
+                        id=ogc_server_id,
+                        _query={
+                            "came_from": self._request.current_route_url(),
+                        },
+                    )
+                )
+                if not response.ok:
+                    LOG.error("Error while cleaning the OGC server cache:\n%s", response.text)
+
+            threading.Thread(target=update_cache).start()
+        except Exception:
+            LOG.error("Error on cleaning the OGC server cache", exc_info=True)

c2cgeoportal_admin/views/restriction_areas.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2021, Camptocamp SA
+# Copyright (c) 2017-2023, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -30,13 +30,14 @@ from functools import partial
 
 import colander
 from c2cgeoform.schema import GeoFormManyToManySchemaNode, GeoFormSchemaNode
-from c2cgeoform.views.abstract_views import AbstractViews, ListField
+from c2cgeoform.views.abstract_views import ListField
 from deform.widget import FormWidget
 from pyramid.view import view_config, view_defaults
 from sqlalchemy.orm import subqueryload
 
 from c2cgeoportal_admin.schemas.roles import roles_schema_node
 from c2cgeoportal_admin.schemas.treegroup import treeitem_edit_url
+from c2cgeoportal_admin.views.logged_views import LoggedViews
 from c2cgeoportal_admin.widgets import ChildrenWidget, ChildWidget
 from c2cgeoportal_commons.models.main import Layer, RestrictionArea
 
@@ -87,7 +88,7 @@ base_schema.add(
 
 
 @view_defaults(match_param="table=restriction_areas")
-class RestrictionAreaViews(AbstractViews):  # type: ignore
+class RestrictionAreaViews(LoggedViews):
     """The restriction area administration view."""
 
     _list_fields = [

c2cgeoportal_admin/views/roles.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2021, Camptocamp SA
+# Copyright (c) 2017-2023, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -30,13 +30,14 @@ from functools import partial
 
 import colander
 from c2cgeoform.schema import GeoFormManyToManySchemaNode, GeoFormSchemaNode
-from c2cgeoform.views.abstract_views import AbstractViews, ListField
+from c2cgeoform.views.abstract_views import ListField
 from deform.widget import FormWidget
 from pyramid.view import view_config, view_defaults
 from sqlalchemy.orm import subqueryload
 
 from c2cgeoportal_admin.schemas.functionalities import functionalities_schema_node
 from c2cgeoportal_admin.schemas.restriction_areas import restrictionareas_schema_node
+from c2cgeoportal_admin.views.logged_views import LoggedViews
 from c2cgeoportal_admin.widgets import ChildrenWidget, ChildWidget
 from c2cgeoportal_commons.models.main import Role
 from c2cgeoportal_commons.models.static import User
@@ -99,7 +100,7 @@ base_schema["users"].children[0].description = ""
 
 
 @view_defaults(match_param="table=roles")
-class RoleViews(AbstractViews):  # type: ignore
+class RoleViews(LoggedViews):
     """The roles administration view."""
 
     _list_fields = [

c2cgeoportal_admin/views/themes.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2021, Camptocamp SA
+# Copyright (c) 2017-2023, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without

c2cgeoportal_admin/views/treeitems.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2021, Camptocamp SA
+# Copyright (c) 2017-2023, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -29,17 +29,18 @@
 from functools import partial
 
 import sqlalchemy
-from c2cgeoform.views.abstract_views import AbstractViews, ListField
+from c2cgeoform.views.abstract_views import ListField
 from pyramid.view import view_config
 from sqlalchemy.orm import subqueryload
 from sqlalchemy.sql.functions import concat
 
+from c2cgeoportal_admin.views.logged_views import LoggedViews
 from c2cgeoportal_commons.models.main import LayergroupTreeitem, Metadata, TreeGroup, TreeItem
 
 _list_field = partial(ListField, TreeItem)
 
 
-class TreeItemViews(AbstractViews):  # type: ignore
+class TreeItemViews(LoggedViews):
     """The admin tree item view."""
 
     _list_fields = [

c2cgeoportal_admin/views/users.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2022, Camptocamp SA
+# Copyright (c) 2017-2023, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
 from functools import partial
 
 from c2cgeoform.schema import GeoFormSchemaNode
-from c2cgeoform.views.abstract_views import AbstractViews, ListField
+from c2cgeoform.views.abstract_views import ListField
 from deform.widget import FormWidget
 from passwordgenerator import pwgenerator
 from pyramid.httpexceptions import HTTPFound
@@ -37,9 +37,10 @@ from pyramid.view import view_config, view_defaults
 from sqlalchemy.orm import aliased, subqueryload
 
 from c2cgeoportal_admin.schemas.roles import roles_schema_node
+from c2cgeoportal_admin.views.logged_views import LoggedViews
 from c2cgeoportal_commons.lib.email_ import send_email_config
 from c2cgeoportal_commons.models.main import Role
-from c2cgeoportal_commons.models.static import User
+from c2cgeoportal_commons.models.static import Log, User
 
 _list_field = partial(ListField, User)
 
@@ -51,7 +52,7 @@ settings_role = aliased(Role)
 
 
 @view_defaults(match_param="table=users")
-class UserViews(AbstractViews):  # type: ignore
+class UserViews(LoggedViews):
     """The admin user view."""
 
     _list_fields = [
@@ -76,6 +77,8 @@ class UserViews(AbstractViews):  # type: ignore
     _id_field = "id"
     _model = User
     _base_schema = base_schema
+    _log_model = Log
+    _name_field = "username"
 
     def _base_query(self):
         return (

c2cgeoportal_admin/widgets.py

@@ -90,11 +90,11 @@ class ChildWidget(MappingWidget):  # type: ignore
     model = TreeItem
     label_field = "name"
 
-    def icon_class(self, child: Any) -> Optional[str]:  # pylint: disable=no-self-use,useless-return
+    def icon_class(self, child: Any) -> Optional[str]:  # pylint: disable=useless-return
         del child
         return None
 
-    def edit_url(  # pylint: disable=no-self-use,useless-return
+    def edit_url(  # pylint: disable=useless-return
         self, request: pyramid.request.Request, child: Any
     ) -> Optional[str]:
         del request

{c2cgeoportal_admin-2.7.1.156.dist-info → c2cgeoportal_admin-2.8.1.87.dist-info}/METADATA

@@ -1,11 +1,13 @@
 Metadata-Version: 2.1
 Name: c2cgeoportal-admin
-Version: 2.7.1.156
+Version: 2.8.1.87
 Summary: c2cgeoportal admin
 Home-page: https://github.com/camptocamp/c2cgeoportal/
 Author: Camptocamp
 Author-email: info@camptocamp.com
+License: UNKNOWN
 Keywords: web gis geoportail c2cgeoportal geocommune pyramid
+Platform: UNKNOWN
 Classifier: Development Status :: 6 - Mature
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Pyramid
@@ -18,23 +20,25 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Topic :: Scientific/Engineering :: GIS
 Classifier: Typing :: Typed
 Description-Content-Type: text/markdown
+Requires-Dist: babel (>=2.9.1)
 Requires-Dist: c2cgeoform
 Requires-Dist: c2cwsgiutils
+Requires-Dist: certifi (>=2022.12.7)
 Requires-Dist: colander
 Requires-Dist: deform
+Requires-Dist: idna (>=3.7)
 Requires-Dist: passwordgenerator
+Requires-Dist: pygments (>=2.15.0)
 Requires-Dist: pyproj
 Requires-Dist: pyramid
 Requires-Dist: pyramid-debugtoolbar
 Requires-Dist: pyramid-jinja2
 Requires-Dist: pyramid-tm
+Requires-Dist: requests (>=2.31.0)
 Requires-Dist: sqlalchemy
-Requires-Dist: zope.event
 Requires-Dist: translationstring
-Requires-Dist: jinja2 (>=2.11.3)
-Requires-Dist: pygments (>=2.7.4)
-Requires-Dist: setuptools (>=65.5.1)
-Requires-Dist: requests (>=2.31.0)
+Requires-Dist: urllib3 (>=1.26.17)
+Requires-Dist: zope.event
 
 # c2cgeoportal admin interface
 
@@ -47,4 +51,6 @@ make preparedev
 make serve
 ```
 
-Now open http://localhost:8888/ in your favorite browser.
+Now open http://localhost:8888/admin/ in your favorite browser.
+
+

{c2cgeoportal_admin-2.7.1.156.dist-info → c2cgeoportal_admin-2.8.1.87.dist-info}/RECORD

@@ -1,16 +1,16 @@
-c2cgeoportal_admin/__init__.py,sha256=4UYLGCcfxd8mfHojIalTFmaYNgD67WFbgVhw2sl5yok,4959
+c2cgeoportal_admin/__init__.py,sha256=uuW2AC81qIXn7bH7MLHzf9fhEK4liGg3Zi-TosyzKNs,5478
 c2cgeoportal_admin/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-c2cgeoportal_admin/routes.py,sha256=So17Lj2v8UigkxVwfYJrK_piDejRkvekPiFibyr3qiw,4676
+c2cgeoportal_admin/routes.py,sha256=tgLP5uKhgX80a2gLCpu6C92UtmqwVkOkmJ-tPxEP3QE,4712
 c2cgeoportal_admin/subscribers.py,sha256=P1CaccDTpuxrWak_gMN2qBurz3OrAZ6aZ1LA7P3avu8,2430
-c2cgeoportal_admin/widgets.py,sha256=tW6brDW-95LuRnSsRd_8xVRKNAkwkYtdi8zQ44TBj18,6132
+c2cgeoportal_admin/widgets.py,sha256=bjMlC4mqx_bAjzIzzu-zqdQ7bc6tVo7mKOMbpmbeN38,6108
 c2cgeoportal_admin/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 c2cgeoportal_admin/lib/lingua_extractor.py,sha256=Dw4vo46TcUnJ7vvxgFezPYidfEdL2pHJUM0qxAaJ1KE,3380
-c2cgeoportal_admin/lib/ogcserver_synchronizer.py,sha256=NuCV8EpUso01to2PYbh6NpXPcD702pQOSslah__Bzus,15421
+c2cgeoportal_admin/lib/ogcserver_synchronizer.py,sha256=Px9SzBAv5qDTtF1xu6IRzr1u77TA8eAC3cjgI0Rxgks,15515
 c2cgeoportal_admin/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 c2cgeoportal_admin/schemas/dimensions.py,sha256=rPMEuIdGiVGS5e0xqXUu-COVKlrWg9rpp-xe-8aHbOQ,2290
 c2cgeoportal_admin/schemas/functionalities.py,sha256=AptqKn2oyy74qivzihNfeNvmaDILsl36bSoJdSNXh9Y,3941
 c2cgeoportal_admin/schemas/interfaces.py,sha256=0NCRDZOqbw7Bwj-l3GNsVwYDHck4F0q1fCSo1kTYoOY,2578
-c2cgeoportal_admin/schemas/metadata.py,sha256=px0Teh0vtyimQfzL7zXHXIEkWtBbD00OsadfDDeqSkY,8991
+c2cgeoportal_admin/schemas/metadata.py,sha256=EOr9hWYBPBJ3iaUmPFgtWnBaNWadX0g9UQ0eeJ6N84E,8991
 c2cgeoportal_admin/schemas/restriction_areas.py,sha256=48hFUgFznl_1bYsl490YSXLbXfjCY_f6gURQtB_7eIk,2598
 c2cgeoportal_admin/schemas/roles.py,sha256=4JJrgZNKsj_wru_YGOWxZTEXGVm0hahbAkYf2aePGzI,2507
 c2cgeoportal_admin/schemas/treegroup.py,sha256=-s_aKAzwYwS9zVsuqQAp_7M_-c00LVq-R6dC8BiUWk0,7039
@@ -18,7 +18,7 @@ c2cgeoportal_admin/schemas/treeitem.py,sha256=qnjrLd2LD7NCBjXqzw7aRn83cw_hYZbepJ
 c2cgeoportal_admin/static/layertree.css,sha256=tk54KGW0yRRmdrY35gOCZG3qTsqWtGNEwvBYPQKhaVs,3177
 c2cgeoportal_admin/static/navbar.css,sha256=QIaAQsb4n17OfwdKEQdmNDVPCP23Yu-oGW4xsSaHyW0,2307
 c2cgeoportal_admin/static/theme.css,sha256=eHtBEJcBtDhyZJvCKNxE5hgril0VpLtcDKfNFdgCSVw,2025
-c2cgeoportal_admin/templates/404.jinja2,sha256=F05OZUzJljcieoCFMP7Oz1F6Jb-VZ06hTOSc9mrb87g,1420
+c2cgeoportal_admin/templates/404.jinja2,sha256=KSpqCNFwv37rKSmX6kL_VvCnn5egcT1eRD6kIKwWx34,1807
 c2cgeoportal_admin/templates/edit.jinja2,sha256=rkBQiz0JZdL7VDq8XrhRLTv6JaiFt_QB8CwP3NMHWQY,1302
 c2cgeoportal_admin/templates/home.jinja2,sha256=WDQwmBGMZxsiOLw9YeYPLuca_mjjntjrTh529euzd1o,1516
 c2cgeoportal_admin/templates/index.jinja2,sha256=HPgilbqh5dv-yc_T_bc1hV2DEtV2wD617_aAERC2VSk,2005
@@ -34,59 +34,62 @@ c2cgeoportal_admin/templates/widgets/functionality_fields.pt,sha256=8TvwXCmQOtYF
 c2cgeoportal_admin/templates/widgets/layer_fields.pt,sha256=RJBYt8ji6YQp9ZaNZJD-caLgy856a6rzlKSMnuZWphw,3223
 c2cgeoportal_admin/templates/widgets/layer_group_fields.pt,sha256=xnqIqFjPPan81OqLwKeDnvNtlhEvYss6h2J9txH5neE,2459
 c2cgeoportal_admin/templates/widgets/layer_v1_fields.pt,sha256=w-MujUevHWmnOkOTbbvES6alDoL_UO1eiMj8SCxcQEY,3956
-c2cgeoportal_admin/templates/widgets/metadata.pt,sha256=jWiLmS0J-cwFkqUxxZwKnkPNX9ShTG2zj0tUCq4TMjQ,3735
+c2cgeoportal_admin/templates/widgets/metadata.pt,sha256=P8noHX8YAv3m6EGh0IDUJCFsyeZDX88HtlqOWab8DAU,3735
 c2cgeoportal_admin/templates/widgets/metadatas.pt,sha256=ErgAH0DA94MO7gqEJ2iZdQ9LRptP2YKH78yze-jdl2Q,1476
 c2cgeoportal_admin/templates/widgets/ogcserver_fields.pt,sha256=x0bDmgrnj9SA6RCVpg3k2lTkkXPkuBFPKMScDgDeyGU,1724
 c2cgeoportal_admin/templates/widgets/restriction_area_fields.pt,sha256=pZVE0KcitAF7HXc3ZlniLr0QwSD05TOhlgieLUR1i7Q,1731
 c2cgeoportal_admin/templates/widgets/role_fields.pt,sha256=gVd9eRYaqw8fGmZauqEUS_Igmyxaa71qcmdC1KUx5nY,2623
 c2cgeoportal_admin/templates/widgets/theme_fields.pt,sha256=68G1Ya8-Dc6pCeP-taQ0ofCIpnY_v0rouazkFhfQflU,3083
 c2cgeoportal_admin/templates/widgets/user_fields.pt,sha256=twmajhUYL1xa47Eu-iATKifNPA5lu3SGpqdKajH6gL8,1753
-c2cgeoportal_admin/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+c2cgeoportal_admin/views/__init__.py,sha256=jtI6CdoXJwizznjwb8ClYySgq4kbwhTIJYutSw89PAw,683
 c2cgeoportal_admin/views/dimension_layers.py,sha256=jupwqX_kO37ukcWE-SsO290JdKENEmfoYxk4sRWb25Y,2598
-c2cgeoportal_admin/views/functionalities.py,sha256=U51DvRd6Jg40VQm66kyVy363cDGGEol0WwaQC8b2ZKM,4002
+c2cgeoportal_admin/views/functionalities.py,sha256=4oZYgs2_M0Usb3GBi40gCP6XvTbR-1PhCDZXiBnhsuk,4031
 c2cgeoportal_admin/views/home.py,sha256=h_hJWIKpzJeSmXl58J0nvZdEg7avSYOOVUEEnlV-r0k,1943
-c2cgeoportal_admin/views/interfaces.py,sha256=3Sl-57PchMlUw_RrvL7F4KTpa57ifpNjOxk-nWqMXpk,3465
-c2cgeoportal_admin/views/layer_groups.py,sha256=CbuURDXMcRXnWbW9aEhXP9nSiSiFq4m3JdtgQS6agxs,3956
+c2cgeoportal_admin/views/interfaces.py,sha256=gzIRrd4D64iSH7NVaR-9oQh8-iMzjZOW5QfTfpQeYU4,3494
+c2cgeoportal_admin/views/layer_groups.py,sha256=Zcdr26jyo4ZZw7sr6hYOjo6PuI9-StQ5KQ7OlIxSEtY,3956
 c2cgeoportal_admin/views/layers.py,sha256=xjvcRvKVpeD-LRuVwE8PGkDT-Kih9ADX0beEDcOP1bE,3039
 c2cgeoportal_admin/views/layers_vectortiles.py,sha256=lREdMc7bo2TVqdf-s6MzNXZoauReqFS_K-Hng49NUT4,4932
-c2cgeoportal_admin/views/layers_wms.py,sha256=p3g2zc2waMBBrlFQjgTUn9YTg3WcXQofx5Yw1b3ozAg,7954
-c2cgeoportal_admin/views/layers_wmts.py,sha256=IxvF_knk3HYsa8gKhIaZsyi5Uhmv_Qrmd50gU8BPla8,7731
-c2cgeoportal_admin/views/layertree.py,sha256=x1nTVwyf-ZK7M0gIDpsDdySMZm3XmE6yGEE9j8VYQ4Y,8589
-c2cgeoportal_admin/views/oauth2_clients.py,sha256=hovhxGKK3et_Lny7UuXsterP_OUSZ1HW7YqhawEXrOw,3740
-c2cgeoportal_admin/views/ogc_servers.py,sha256=rK0dIS2XLTc5EDeGrnDf_mpHlNXJsCEyUpci_lIexR8,7476
-c2cgeoportal_admin/views/restriction_areas.py,sha256=0Zpo8p5Zsw3JdPCH8kqWr020boBpNiKMhARKcgCsOVU,5549
-c2cgeoportal_admin/views/roles.py,sha256=7BjQ0zLcsf6JW8OgBKJukaMRksUB-VKTeILfhP9bLG0,5858
-c2cgeoportal_admin/views/themes.py,sha256=Qv6sZ7op90JEd7ASGuTU68rjTdsRrGlf0clYqqumuFI,5710
+c2cgeoportal_admin/views/layers_wms.py,sha256=Kpgr-eWME9zxahkf-re1w6wkToKBqyInmqd_DHhj9Kc,8040
+c2cgeoportal_admin/views/layers_wmts.py,sha256=HNZalKLLhPF7aXLxuFP07yr9-MGnJTg-CVD-GeokvMM,7815
+c2cgeoportal_admin/views/layertree.py,sha256=plb5fL9vTaSe9EFp8VmUWl5iD9FuiQ-3TuStKAGjIKo,8587
+c2cgeoportal_admin/views/logged_views.py,sha256=_XHoIl7Lw3SV_1T0c0JUeIhkluzNnjNrSUgimfk993E,3169
+c2cgeoportal_admin/views/logs.py,sha256=I4ZnfNtBZmriDLIzLpLiX5HPm3Y1UvIQehemPbC2rL0,3616
+c2cgeoportal_admin/views/oauth2_clients.py,sha256=lfMSwZW7pybQx3PR1btRY7XFLfx1TOx7ooVgllOqK-s,3798
+c2cgeoportal_admin/views/ogc_servers.py,sha256=nGTs_pDr2knS_NAakqvxmjZE2ulrWxn2puWA_uNqgaY,9412
+c2cgeoportal_admin/views/restriction_areas.py,sha256=uzfQQVRFCP-OCg1sdGzQCTkO35C1H8DZNMWIquFQqRw,5578
+c2cgeoportal_admin/views/roles.py,sha256=VP0OEsW2_l99YnxGO5mdOkvPBs4Hs3nyRSbetIKtx14,5887
+c2cgeoportal_admin/views/themes.py,sha256=mxpf56KXwCKG5tCYgV7xgPtQqlCU67iOBOLB7cHD-Hc,5710
 c2cgeoportal_admin/views/themes_ordering.py,sha256=NYN3I2tDwLW5E4G-695DwV0dCbHUAObWVFYZ8Bir1-o,5590
-c2cgeoportal_admin/views/treeitems.py,sha256=p-Ba_v3UFtUZEmlct4MZmkwv7jzMoxNKnCVa_FX2hxg,3860
-c2cgeoportal_admin/views/users.py,sha256=YzyKYDDTVn69NQPkrlkmbpgrtsIkK_cxqlcWa6utAVA,5355
-tests/__init__.py,sha256=JbVMbOZgS0u5_MhWBnyzT1gdv3cXwhkXyLQgDqpZAik,9525
+c2cgeoportal_admin/views/treeitems.py,sha256=C-vjScmb_HI5QOowx3MGZBJqAHDkGTG90vshPG7FvgA,3889
+c2cgeoportal_admin/views/users.py,sha256=sXCgVluLLnbbQTG8Q7tmaVfnEcHj5fBiHFCG7owVp1w,5439
+tests/__init__.py,sha256=oo8kqGfoSh8AV0HhTqQfC0izcIQ8ZQPkNmONSEUUby4,9556
 tests/conftest.py,sha256=ah7JmR2epDZul2rmMH5wuUzkSpXIjm8dd-cgGjK6_k0,2119
-tests/test_edit_url.py,sha256=00Q9E3QOtsEEB0YJQehllFr1ztQCU3wc9OyayXCHYI4,4495
-tests/test_functionalities.py,sha256=CPHxBueoCt8W76VJN2sCouxQyc7LD7ccusRah5UK2ys,4126
-tests/test_home.py,sha256=oA4i-V9jJQQgHD9Gz79mgIEMUCRw3tmIQVqdhM9Q2Fo,426
-tests/test_interface.py,sha256=ml1yM4t1o6jIQEHZRwMywjt7mjkUhP-34VKBgHOmWes,4704
-tests/test_layer_groups.py,sha256=Bb1Rsy8QkzGee6edY4UQY8hcxvp54PE7gXUcHoi__JA,11062
-tests/test_layers_vectortiles.py,sha256=DjOLkm3o8nPJJbd010Xi_pwHTK5roiHoQBYAuNaZW5c,9395
-tests/test_layers_wms.py,sha256=MISvkAjEZ4oSD1xg7Zah_GKiBHNu60D8kT03f241wuc,18175
-tests/test_layers_wmts.py,sha256=jjO3AbOQgHgC2yXdYke339W11Ygz1b8DpuAn4OXLnxE,11185
-tests/test_layertree.py,sha256=uu-2AzVtqr87eqq9w_5EWPR_KIXFFjEipEA0_ImnkCU,11336
+tests/test_edit_url.py,sha256=Mo_Vo5xvdpPasfjvhQUif5F3nKVpJ6GQJ_x_Hj5VNY8,4494
+tests/test_functionalities.py,sha256=tGQbEsQWjr_oExI3vWhLIioxylDaoUaOfEas42YPw50,5191
+tests/test_home.py,sha256=oWsKaWqRicNpUdaca54YvLIBRaGYnsXlv_Tjqv7guEQ,425
+tests/test_interface.py,sha256=z1jpRzW0R2e9BJWWurE-j-YkG5yhorn7h1XRIauUQ7A,5669
+tests/test_layer_groups.py,sha256=bisbaDY0SiyBc0rexYajbcvfdDt8Kux6VqXIEBLSULM,12191
+tests/test_layers_vectortiles.py,sha256=PpnR8wJyRcsByPTOrrtltQUYzzQ0qRzQM2no1z1rLgU,10404
+tests/test_layers_wms.py,sha256=ynqO1cnXk2ZbSXR3l9hp0IyG8PMXbmR4eyubnwRvRfU,19494
+tests/test_layers_wmts.py,sha256=7zye_pZ_e0RyJdoT8oeHKPoYJMKWfTg0K8lEgMIu77Q,12181
+tests/test_layertree.py,sha256=Dxe10OwuilQ-AEgVIDU4Ns9U6PQ4kPWTxwItdBE7nSg,11335
 tests/test_learn.py,sha256=gQwe-Bim0eihZH0rbBWDn6_rIBxvQD_lyu9MlOljupM,2307
-tests/test_left_menu.py,sha256=-K_429ZcW5Hsz317StIRVz8VtU7GDMH7UCTzZDfckUo,920
-tests/test_lingua_extractor_config.py,sha256=3dqgIdCB1M3YPzXrgDCFQ74t0t4QRXwdQZSy6AMqKp8,2515
+tests/test_left_menu.py,sha256=xnlv5sD0k3wpCChKCnbpYRN0TA895pg8k6wVvjf99-4,919
+tests/test_lingua_extractor_config.py,sha256=vAfunJ4tVuqTJg4xinPwlB0EvA4sYhjY_iDBfMq8EW4,2495
+tests/test_logs.py,sha256=sUBC61rCSIfg9HBavhT6c0QPmPYUnEfDm91bUaUF4Q8,3147
 tests/test_main.py,sha256=_gUdMrMMAEzvGIf1QwkoHQkd0eBACz05ycTidCHP5Ao,365
-tests/test_metadatas.py,sha256=dawAKLxyWy4Ok3TWAR5zsB_IN_Ci_VJdjNE9fU5NVjE,12089
-tests/test_oauth2_clients.py,sha256=UaTz7jE0-V2JJ4VkjA3W0FlzgkfacI1jchiynXNNYbc,5782
-tests/test_ogc_servers.py,sha256=qPrbLFw8zaPOpk-fbydJUtfgLl9nxA81jOUNd1l8EUI,6436
-tests/test_restriction_areas.py,sha256=S97lbxHghyhz9h8Sv78jYt2EOQEgwlUp8zCfOtmV-OU,7925
-tests/test_role.py,sha256=99Rk4PCTtoVzbiTP3cR3cVkuIArdLywBl2Hx8Pk5lnE,11820
-tests/test_themes.py,sha256=e-OGon6beHfY4q8xOGsYjW-_pm0-wTA18DPBOz6F9iM,15181
-tests/test_themes_ordering.py,sha256=qIEgLgIjSYpWqMVXBAhOk6BKBUAPXkiXsxWB_A1Dy4s,2244
+tests/test_metadatas.py,sha256=bVNxvZRKNRMmjQGr7Al1d4H85EjEaoesRpxytyld4Fw,12088
+tests/test_oauth2_clients.py,sha256=-aowsa2Dw77lxzuBb9ULW4iEJSB9yut-eYGP7YptT0M,7000
+tests/test_ogc_servers.py,sha256=DGSMVIzYnw3bJT53VFGuPYIPMPCyHJDb5ZPJj1VM3Bo,8204
+tests/test_restriction_areas.py,sha256=5VhO9ZvtFQPy1kVFm96Mh_vf1LCI5oeIdl0dfvS6JD8,9003
+tests/test_role.py,sha256=eD7dXwP7RjCg14T9ncTfJuMUU4caY9yW3l5ka-gtCd4,12776
+tests/test_themes.py,sha256=uhzHe2TbuNoLnL4VdYATPnOqtnZWWPKsvUTq6GUxwiU,16207
+tests/test_themes_ordering.py,sha256=T4Esr0C3EN5UdeEyYLa4ePvEn-bx3RNPkGBK3lDFoBo,2243
 tests/test_treegroup.py,sha256=Plv119G4TWlurWLE7Z1mWGeHHPScK_fWKcDmDzMUlIU,576
-tests/test_user.py,sha256=pW2Fsbw8wIP2H3BxAMUojSonhMMyr63jsWFmEteaogk,11659
-tests/themes_ordering.py,sha256=mbjTJHl63UVdv5SsfgDrjOx-1z6C5L4wDSCzIh7LPAE,1343
-c2cgeoportal_admin-2.7.1.156.dist-info/METADATA,sha256=cRegyrlS02-K1HNMG99ohp7l0WSyWQpqnPMJC7zInU4,1492
-c2cgeoportal_admin-2.7.1.156.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-c2cgeoportal_admin-2.7.1.156.dist-info/entry_points.txt,sha256=ZF-xnP-Q_zr7y6yRmVqjIGVZ1L2iKi5uaOxjxJQBuG4,164
-c2cgeoportal_admin-2.7.1.156.dist-info/top_level.txt,sha256=DgcTJgTvpJUB8HqwYB14PdLBPAOAFk0B8oqnSTFoAU4,25
-c2cgeoportal_admin-2.7.1.156.dist-info/RECORD,,
+tests/test_user.py,sha256=xD0yoJa_babVK69hHQzDkTs6wRWBMXFGD8k0-DfOd-4,12814
+tests/themes_ordering.py,sha256=UdydcRIzWC6RRnTMfl2JM_250DHuAhGC7rijHqfy7lk,1342
+c2cgeoportal_admin-2.8.1.87.dist-info/METADATA,sha256=0P1ADIuP41MRtydXCS-ldsnsw6lk4Yz_zmGTBaNO3QA,1596
+c2cgeoportal_admin-2.8.1.87.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+c2cgeoportal_admin-2.8.1.87.dist-info/entry_points.txt,sha256=kz-7AnYsbtK04jTpGUtcOeu2NbQiXW3CQV3AjyC32tw,165
+c2cgeoportal_admin-2.8.1.87.dist-info/top_level.txt,sha256=DgcTJgTvpJUB8HqwYB14PdLBPAOAFk0B8oqnSTFoAU4,25
+c2cgeoportal_admin-2.8.1.87.dist-info/RECORD,,

{c2cgeoportal_admin-2.7.1.156.dist-info → c2cgeoportal_admin-2.8.1.87.dist-info}/entry_points.txt

@@ -3,3 +3,4 @@ geomapfish-admin-config = c2cgeoportal_admin.lib.lingua_extractor:GeomapfishConf
 
 [paste.app_factory]
 main = c2cgeoportal_admin:main
+

tests/__init__.py

@@ -54,7 +54,6 @@ def factory_build_layers(layer_builder, dbsession, add_dimension=True):
 
     layers = []
     for i in range(0, 25):
-
         layer = layer_builder(i)
 
         if add_dimension:
@@ -90,7 +89,6 @@ def factory_build_layers(layer_builder, dbsession, add_dimension=True):
 
 
 class AbstractViewsTests:
-
     _prefix = None  # url prefix (index view url). Example: /users
 
     def get(self, test_app, path="", locale="en", status=200, **kwargs):
@@ -120,7 +118,8 @@ class AbstractViewsTests:
         )
         actions = resp.html.select_one('th[data-field="actions"]')
         assert "false" == actions.attrs["data-sortable"]
-        assert 1 == len(list(filter(lambda x: next(x.stripped_strings) == new, resp.html.findAll("a"))))
+        if new is not False:
+            assert 1 == len(list(filter(lambda x: next(x.stripped_strings) == new, resp.html.findAll("a"))))
 
     def check_search(self, test_app, search="", offset=0, limit=10, sort="", order="", total=None):
         json = test_app.post(

tests/test_edit_url.py

@@ -92,7 +92,6 @@ def edit_url_test_data(dbsession, transact):
 
 @pytest.mark.usefixtures("edit_url_test_data", "test_app")
 class TestUrlEdit(AbstractViewsTests):
-
     _prefix = "/admin/"
 
     def _get(self, test_app, tablename, pk):

tests/test_functionalities.py

@@ -31,7 +31,6 @@ def functionality_test_data(dbsession, transact, settings):
 
 @pytest.mark.usefixtures("functionality_test_data", "test_app")
 class TestFunctionality(AbstractViewsTests):
-
     _prefix = "/admin/functionalities"
 
     def test_index_rendering(self, test_app):
@@ -53,7 +52,7 @@ class TestFunctionality(AbstractViewsTests):
         self.check_search(test_app, "default_basemap", total=1)
 
     def test_submit_new(self, dbsession, test_app):
-        from c2cgeoportal_commons.models.main import Functionality
+        from c2cgeoportal_commons.models.main import Functionality, Log, LogAction
 
         resp = test_app.post(
             "/admin/functionalities/new",
@@ -66,7 +65,17 @@ class TestFunctionality(AbstractViewsTests):
         ).group(1)
         assert functionality.name == "new_name"
 
-    def test_edit(self, test_app, functionality_test_data):
+        log = dbsession.query(Log).one()
+        assert log.date != None
+        assert log.action == LogAction.INSERT
+        assert log.element_type == "functionality"
+        assert log.element_id == functionality.id
+        assert log.element_name == functionality.name
+        assert log.username == "test_user"
+
+    def test_edit(self, test_app, functionality_test_data, dbsession):
+        from c2cgeoportal_commons.models.main import Log, LogAction
+
         functionality = functionality_test_data["functionalities"][0]
         resp = test_app.get(f"/admin/functionalities/{functionality.id}", status=200)
         form = resp.form
@@ -77,14 +86,30 @@ class TestFunctionality(AbstractViewsTests):
         assert form.submit().status_int == 302
         assert functionality.description == "new_description"
 
+        log = dbsession.query(Log).one()
+        assert log.date != None
+        assert log.action == LogAction.UPDATE
+        assert log.element_type == "functionality"
+        assert log.element_id == functionality.id
+        assert log.element_name == functionality.name
+        assert log.username == "test_user"
+
     def test_delete(self, test_app, functionality_test_data, dbsession):
-        from c2cgeoportal_commons.models.main import Functionality
+        from c2cgeoportal_commons.models.main import Functionality, Log, LogAction
 
         functionality = functionality_test_data["functionalities"][0]
         deleted_id = functionality.id
         test_app.delete(f"/admin/functionalities/{deleted_id}", status=200)
         assert dbsession.query(Functionality).get(deleted_id) is None
 
+        log = dbsession.query(Log).one()
+        assert log.date != None
+        assert log.action == LogAction.DELETE
+        assert log.element_type == "functionality"
+        assert log.element_id == functionality.id
+        assert log.element_name == functionality.name
+        assert log.username == "test_user"
+
     def test_duplicate(self, functionality_test_data, test_app, dbsession):
         from c2cgeoportal_commons.models.main import Functionality
 

tests/test_home.py

@@ -5,7 +5,6 @@ from . import AbstractViewsTests
 
 @pytest.mark.usefixtures("test_app")
 class TestHome(AbstractViewsTests):
-
     _prefix = "/admin/"
 
     def test_index_rendering(self, test_app):