c2cgeoportal-admin 2.6.0__py3-none-any.whl → 2.8.1.180__py3-none-any.whl

c2cgeoportal_admin/views/themes_ordering.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2017-2020, Camptocamp SA
+# Copyright (c) 2017-2021, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -41,7 +39,9 @@ from c2cgeoportal_admin.widgets import ChildrenWidget, ChildWidget
 from c2cgeoportal_commons.models.main import Theme, TreeItem
 
 
-class ThemeOrderSchema(GeoFormSchemaNode):  # pylint: disable=abstract-method
+class ThemeOrderSchema(GeoFormSchemaNode):  # type: ignore # pylint: disable=abstract-method
+    """The theme order schema."""
+
     def objectify(self, dict_, context=None):
         context = self.dbsession.query(Theme).get(dict_["id"])
         context = super().objectify(dict_, context)
@@ -50,14 +50,16 @@ class ThemeOrderSchema(GeoFormSchemaNode):  # pylint: disable=abstract-method
 
 @colander.deferred
 def themes(node, kw):  # pylint: disable=unused-argument
+    """Get some theme metadata."""
     query = kw["dbsession"].query(Theme).order_by(Theme.ordering, Theme.name)
     return [
-        {"id": item.id, "label": item.name, "icon_class": "icon-{}".format(item.item_type), "group": "All"}
+        {"id": item.id, "label": item.name, "icon_class": f"icon-{item.item_type}", "group": "All"}
         for item in query
     ]
 
 
 def themes_validator(node, cstruct):
+    """Validate the theme."""
     for dict_ in cstruct:
         if not dict_["id"] in [item["id"] for item in node.candidates]:
             raise colander.Invalid(
@@ -66,7 +68,9 @@ def themes_validator(node, cstruct):
             )
 
 
-class ThemesOrderingSchema(colander.MappingSchema):
+class ThemesOrderingSchema(colander.MappingSchema):  # type: ignore
+    """The theme ordering schema."""
+
     themes = colander.SequenceSchema(
         ThemeOrderSchema(
             Theme,
@@ -76,7 +80,7 @@ class ThemesOrderingSchema(colander.MappingSchema):
                 input_name="id",
                 model=TreeItem,
                 label_field="name",
-                icon_class=lambda item: "icon-{}".format(item.item_type),
+                icon_class=lambda item: f"icon-{item.item_type}",
                 edit_url=treeitem_edit_url,
             ),
         ),
@@ -87,7 +91,8 @@ class ThemesOrderingSchema(colander.MappingSchema):
     )
 
 
-class ThemesOrdering(AbstractViews):
+class ThemesOrdering(AbstractViews):  # type: ignore
+    """The theme ordering admin view."""
 
     _base_schema = ThemesOrderingSchema()
 

c2cgeoportal_admin/views/treeitems.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2017-2020, Camptocamp SA
+# Copyright (c) 2017-2023, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -30,17 +28,21 @@
 
 from functools import partial
 
-from c2cgeoform.views.abstract_views import AbstractViews, ListField
+import sqlalchemy
+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):
+class TreeItemViews(LoggedViews):
+    """The admin tree item view."""
+
     _list_fields = [
         _list_field("id"),
         _list_field("name"),
@@ -50,9 +52,7 @@ class TreeItemViews(AbstractViews):
     _extra_list_fields_no_parents = [
         _list_field(
             "metadatas",
-            renderer=lambda layers_group: ", ".join(
-                ["{}: {}".format(m.name, m.value) or "" for m in layers_group.metadatas]
-            ),
+            renderer=lambda treeitem: ", ".join([f"{m.name}: {m.value}" or "" for m in treeitem.metadatas]),
             filter_column=concat(Metadata.name, ": ", Metadata.value).label("metadata"),
         )
     ]
@@ -72,16 +72,18 @@ class TreeItemViews(AbstractViews):
     def save(self):
         response = super().save()
         # correctly handles the validation error as if there is a validation error, cstruct is empty
-        has_to_be_registred_in_parent = (
+        has_to_be_registered_in_parent = (
             hasattr(self, "_appstruct") and self._appstruct is not None and self._appstruct.get("parent_id")
         )
-        if has_to_be_registred_in_parent:
-            parent = self._request.dbsession.query(TreeGroup).get(has_to_be_registred_in_parent)
+        if has_to_be_registered_in_parent:
+            parent = self._request.dbsession.query(TreeGroup).get(has_to_be_registered_in_parent)
             rel = LayergroupTreeitem(parent, self._obj, 100)
             self._request.dbsession.add(rel)
         return response
 
-    def _base_query(self, query):  # pylint: disable=arguments-differ
+    def _base_query(  # pylint: disable=arguments-differ
+        self, query: sqlalchemy.orm.query.Query
+    ) -> sqlalchemy.orm.query.Query:
         return (
             query.outerjoin("metadatas")
             .options(subqueryload("parents_relation").joinedload("treegroup"))

c2cgeoportal_admin/views/users.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2017-2020, Camptocamp SA
+# Copyright (c) 2017-2023, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -31,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
@@ -39,21 +37,24 @@ 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)
 
 base_schema = GeoFormSchemaNode(User, widget=FormWidget(fields_template="user_fields"))
-base_schema.add(roles_schema_node("roles"))
+base_schema.add(roles_schema_node(User.roles))
 base_schema.add_unique_validator(User.username, User.id)
 
 settings_role = aliased(Role)
 
 
 @view_defaults(match_param="table=users")
-class UserViews(AbstractViews):
+class UserViews(LoggedViews):
+    """The admin user view."""
+
     _list_fields = [
         _list_field("id"),
         _list_field("username"),
@@ -76,6 +77,8 @@ class UserViews(AbstractViews):
     _id_field = "id"
     _model = User
     _base_schema = base_schema
+    _log_model = Log
+    _name_field = "username"
 
     def _base_query(self):
         return (
@@ -119,6 +122,8 @@ class UserViews(AbstractViews):
                     email=user.email,
                     user=user.username,
                     password=password,
+                    application_url=self._request.route_url("base"),
+                    current_url=self._request.current_route_url(),
                 )
 
             return response

c2cgeoportal_admin/widgets.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2018-2020, Camptocamp SA
+# Copyright (c) 2018-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -27,9 +25,10 @@
 # of the authors and should not be interpreted as representing official policies,
 # either expressed or implied, of the FreeBSD Project.
 
-from typing import Optional
+from typing import Any, Optional
 
 import colander
+import pyramid.request
 from colander import Mapping, SchemaNode
 from deform import widget
 from deform.widget import MappingWidget, SequenceWidget
@@ -55,10 +54,11 @@ widget.DateTimeInputWidget._pstruct_schema = SchemaNode(  # pylint: disable=prot
 )
 
 
-class ChildWidget(MappingWidget):
+class ChildWidget(MappingWidget):  # type: ignore
     """
-    Extension of the widget ````deform.widget.MappingWidget`` to be used in conjunction with ChildrenWidget,
-    to manage n-m relationships.
+    Extension of the widget ````deform.widget.MappingWidget``.
+
+    To be used in conjunction with ChildrenWidget, to manage n-m relationships.
 
     Do not embed complete children forms, but just an hidden input for child primary key.
 
@@ -82,7 +82,7 @@ class ChildWidget(MappingWidget):
 
     For further attributes, please refer to the documentation of
     ``deform.widget.MappingWidget`` in the deform documentation:
-    <http://deform.readthedocs.org/en/latest/api.html>
+    <https://deform.readthedocs.org/en/latest/api.html>
     """
 
     template = "child"
@@ -90,11 +90,13 @@ class ChildWidget(MappingWidget):
     model = TreeItem
     label_field = "name"
 
-    def icon_class(self, child) -> 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(self, request, child) -> Optional[str]:  # 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
         del child
         return None
@@ -107,10 +109,11 @@ class ChildWidget(MappingWidget):
         return super().serialize(field, cstruct, **kw)
 
 
-class ChildrenWidget(SequenceWidget):
+class ChildrenWidget(SequenceWidget):  # type: ignore
     """
-    Extension of the widget ````deform.widget.SequenceWidget``, to be used in conjunction with ChildWidget,
-    to manage n-m relationships.
+    Extension of the widget ````deform.widget.SequenceWidget``.
+
+    To be used in conjunction with ChildWidget, to manage n-m relationships.
 
     Use Magicsuggest for searching into parent schema candidates property, which should be a list of
     dictionaries of the form:
@@ -129,7 +132,7 @@ class ChildrenWidget(SequenceWidget):
 
     For further attributes, please refer to the documentation of
     ``deform.widget.SequenceWidget`` in the deform documentation:
-    <http://deform.readthedocs.org/en/latest/api.html>
+    <https://deform.readthedocs.org/en/latest/api.html>
     """
 
     template = "children"

{c2cgeoportal_admin-2.6.0.dist-info → c2cgeoportal_admin-2.8.1.180.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: c2cgeoportal-admin
-Version: 2.6.0
+Version: 2.8.1.180
 Summary: c2cgeoportal admin
 Home-page: https://github.com/camptocamp/c2cgeoportal/
 Author: Camptocamp
@@ -8,27 +8,36 @@ Author-email: info@camptocamp.com
 License: UNKNOWN
 Keywords: web gis geoportail c2cgeoportal geocommune pyramid
 Platform: UNKNOWN
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
+Classifier: Development Status :: 6 - Mature
+Classifier: Environment :: Web Environment
 Classifier: Framework :: Pyramid
-Classifier: Topic :: Internet :: WWW/HTTP
-Classifier: Topic :: Internet :: WWW/HTTP :: WSGI :: Application
+Classifier: Intended Audience :: Other Audience
 Classifier: License :: OSI Approved :: BSD License
-Classifier: Development Status :: 6 - Mature
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+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.32.0)
 Requires-Dist: sqlalchemy
 Requires-Dist: translationstring
+Requires-Dist: urllib3 (>=1.26.17)
 Requires-Dist: zope.event
 
 # c2cgeoportal admin interface
@@ -42,6 +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.8.1.180.dist-info/RECORD

@@ -0,0 +1,95 @@
+c2cgeoportal_admin/__init__.py,sha256=uuW2AC81qIXn7bH7MLHzf9fhEK4liGg3Zi-TosyzKNs,5478
+c2cgeoportal_admin/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+c2cgeoportal_admin/routes.py,sha256=tgLP5uKhgX80a2gLCpu6C92UtmqwVkOkmJ-tPxEP3QE,4712
+c2cgeoportal_admin/subscribers.py,sha256=P1CaccDTpuxrWak_gMN2qBurz3OrAZ6aZ1LA7P3avu8,2430
+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=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=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=8_aDM5xhtT7m-amaccEgH8T5O-SoRtFYIcGZ01VwHr0,7036
+c2cgeoportal_admin/schemas/treeitem.py,sha256=qnjrLd2LD7NCBjXqzw7aRn83cw_hYZbepJdLzOz0rBk,2117
+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=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
+c2cgeoportal_admin/templates/layertree.jinja2,sha256=1ys5XDY3nb4gAu8JazkwSFeJUdGRadT7WaBuvin_hYg,9830
+c2cgeoportal_admin/templates/layout.jinja2,sha256=KCDwATUYBu-ZXv7ijo0S0PlTmKtU-JxW8gMhvPA_kAE,4105
+c2cgeoportal_admin/templates/navigation_navbar.jinja2,sha256=XzVQDpo3ClIiRxWf5eDULHZi9u-veYOmndiE_Twqxog,4166
+c2cgeoportal_admin/templates/ogcserver_synchronize.jinja2,sha256=rdQfbHBzrV5VUq5TC97QR7pv8bRvrdKaUUZpnQyldoE,4327
+c2cgeoportal_admin/templates/widgets/child.pt,sha256=JjxI0oVADhS3SoFgg0iN8P4ca1I_UGr7fWRp3wpZXsE,2159
+c2cgeoportal_admin/templates/widgets/children.pt,sha256=0TPpatvmZcU2TxbcZMjDz8VQcLGtoHkuDJ-eAGvjXho,6625
+c2cgeoportal_admin/templates/widgets/dimension.pt,sha256=1BXmE7s9JpzaJSHAQEtZk0DHB11pQ4FNQPaG_4c8CYo,2627
+c2cgeoportal_admin/templates/widgets/dimensions.pt,sha256=LjWjsgdcFYZxpB_30-3NOfvq5KYkKTu49F-P-r9d5Jg,1211
+c2cgeoportal_admin/templates/widgets/functionality_fields.pt,sha256=8TvwXCmQOtYFkiqsa4AHFUYsWk92LLnthz8bDrLmMBc,1969
+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=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=jtI6CdoXJwizznjwb8ClYySgq4kbwhTIJYutSw89PAw,683
+c2cgeoportal_admin/views/dimension_layers.py,sha256=jupwqX_kO37ukcWE-SsO290JdKENEmfoYxk4sRWb25Y,2598
+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=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=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=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=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=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=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=xD0yoJa_babVK69hHQzDkTs6wRWBMXFGD8k0-DfOd-4,12814
+tests/themes_ordering.py,sha256=UdydcRIzWC6RRnTMfl2JM_250DHuAhGC7rijHqfy7lk,1342
+c2cgeoportal_admin-2.8.1.180.dist-info/METADATA,sha256=4IZ5Bu5mH3ErjEWDbuTwu1xItrt3UDnOtbtmZXLYQxQ,1597
+c2cgeoportal_admin-2.8.1.180.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+c2cgeoportal_admin-2.8.1.180.dist-info/entry_points.txt,sha256=kz-7AnYsbtK04jTpGUtcOeu2NbQiXW3CQV3AjyC32tw,165
+c2cgeoportal_admin-2.8.1.180.dist-info/top_level.txt,sha256=DgcTJgTvpJUB8HqwYB14PdLBPAOAFk0B8oqnSTFoAU4,25
+c2cgeoportal_admin-2.8.1.180.dist-info/RECORD,,

{c2cgeoportal_admin-2.6.0.dist-info → c2cgeoportal_admin-2.8.1.180.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.34.2)
+Generator: bdist_wheel (0.40.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

c2cgeoportal_admin-2.8.1.180.dist-info/entry_points.txt

@@ -0,0 +1,6 @@
+[lingua.extractors]
+geomapfish-admin-config = c2cgeoportal_admin.lib.lingua_extractor:GeomapfishConfigExtractor
+
+[paste.app_factory]
+main = c2cgeoportal_admin:main
+

tests/__init__.py

@@ -38,7 +38,7 @@ def factory_build_layers(layer_builder, dbsession, add_dimension=True):
         RestrictionArea,
     )
 
-    restrictionareas = [RestrictionArea(name="restrictionarea_{}".format(i)) for i in range(0, 5)]
+    restrictionareas = [RestrictionArea(name=f"restrictionarea_{i}") for i in range(0, 5)]
 
     interfaces = [Interface(name) for name in ["desktop", "mobile", "edit", "routing"]]
 
@@ -50,11 +50,10 @@ def factory_build_layers(layer_builder, dbsession, add_dimension=True):
         ("snappingConfig", '{"tolerance": 50}'),
     ]
 
-    groups = [LayerGroup(name="layer_group_{}".format(i)) for i in range(0, 5)]
+    groups = [LayerGroup(name=f"layer_group_{i}") for i in range(0, 5)]
 
     layers = []
     for i in range(0, 25):
-
         layer = layer_builder(i)
 
         if add_dimension:
@@ -90,23 +89,22 @@ 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):
         return test_app.get(
-            "{}{}".format(self._prefix, path),
-            headers={"Cookie": "_LOCALE_={}".format(locale)},
+            f"{self._prefix}{path}",
+            headers={"Cookie": f"_LOCALE_={locale}"},
             status=status,
             **kwargs,
         )
 
     def get_item(self, test_app, item_id, **kwargs):
-        return self.get(test_app, "/{}".format(item_id), **kwargs)
+        return self.get(test_app, f"/{item_id}", **kwargs)
 
     def check_left_menu(self, resp, title):
         link = resp.html.select_one(".navbar li.active a")
-        assert "http://localhost{}".format(self._prefix) == link.attrs["href"]
+        assert f"http://localhost{self._prefix}" == link.attrs["href"]
         assert title == link.getText()
 
     def check_grid_headers(self, resp, expected_col_headers, new="New"):
@@ -120,11 +118,12 @@ 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(
-            "{}/grid.json".format(self._prefix),
+            f"{self._prefix}/grid.json",
             params={"offset": offset, "limit": limit, "search": search, "sort": sort, "order": order},
             status=200,
         ).json
@@ -135,8 +134,8 @@ class AbstractViewsTests:
     def check_checkboxes(self, form, name, expected):
         for i, exp in enumerate(expected):
             field = form.get(name, index=i)
-            checkbox = form.html.select_one("#{}".format(field.id))
-            label = form.html.select_one("label[for={}]".format(field.id))
+            checkbox = form.html.select_one(f"#{field.id}")
+            label = form.html.select_one(f"label[for={field.id}]")
             assert exp["label"] == list(label.stripped_strings)[0]
             assert exp["value"] == checkbox["value"]
             assert exp["checked"] == field.checked

tests/conftest.py

@@ -56,6 +56,7 @@ def app(app_env, dbsession):
     config.add_request_method(lambda request: dbsession, "dbsession", reify=True)
     config.add_route("user_add", "user_add")
     config.add_route("users_nb", "users_nb")
+    config.add_route("base", "/", static=True)
     config.scan(package="tests")
     app = config.make_wsgi_app()
     yield app
@@ -67,7 +68,7 @@ def settings(app_env):
     yield app_env.get("registry").settings
 
 
-@pytest.fixture(scope="session")  # noqa: F811
+@pytest.fixture(scope="session")  # noqa: ignore=F811
 @pytest.mark.usefixtures("app")
 def test_app(request, app):
     testapp = WebTestApp(app)

tests/test_edit_url.py

@@ -24,12 +24,12 @@ def edit_url_test_data(dbsession, transact):
         Theme,
     )
 
-    restrictionareas = [RestrictionArea(name="restrictionarea_{}".format(i)) for i in range(0, 5)]
+    restrictionareas = [RestrictionArea(name=f"restrictionarea_{i}") for i in range(0, 5)]
     functionalities = {}
-    for name in ("default_basemap", "location"):
+    for name in ("default_basemap", "default_theme"):
         functionalities[name] = []
         for v in range(0, 4):
-            functionality = Functionality(name=name, value="value_{}".format(v))
+            functionality = Functionality(name=name, value=f"value_{v}")
             dbsession.add(functionality)
             functionalities[name].append(functionality)
 
@@ -38,10 +38,10 @@ def edit_url_test_data(dbsession, transact):
 
     layers_wmts = []
     for i in range(0, 5):
-        name = "layer_wmts_{}".format(i)
+        name = f"layer_wmts_{i}"
         layer_wmts = LayerWMTS(name=name)
         layer_wmts.layer = name
-        layer_wmts.url = "https://server{}.net/wmts".format(i)
+        layer_wmts.url = f"https://server{i}.net/wmts"
         layer_wmts.restrictionareas = [restrictionareas[i % 5], restrictionareas[(i + 2) % 5]]
         if i % 10 != 1:
             layer_wmts.interfaces = [interfaces[i % 4], interfaces[(i + 2) % 4]]
@@ -52,8 +52,8 @@ def edit_url_test_data(dbsession, transact):
 
     layers_wms = []
     for i in range(0, 5):
-        layer_wms = LayerWMS(name="layer_wms_{}".format(i))
-        layer_wms.layer = "wms_layer_{}".format(i)
+        layer_wms = LayerWMS(name=f"layer_wms_{i}")
+        layer_wms.layer = f"wms_layer_{i}"
         layer_wms.ogc_server = ogc_server
         layers_wms.append(layer_wms)
         dbsession.add(layer_wms)
@@ -63,9 +63,7 @@ def edit_url_test_data(dbsession, transact):
     for i in range(0, 5):
         role = Role("secretary_" + str(i))
         role.functionalities = [
-            functionalities["default_basemap"][0],
-            functionalities["location"][0],
-            functionalities["location"][1],
+            functionalities["default_theme"][0],
         ]
         role.restrictionareas = [restrictionareas[0], restrictionareas[1]]
         dbsession.add(role)
@@ -94,16 +92,15 @@ 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):
-        path = "/{}/{}".format(tablename, pk)
+        path = f"/{tablename}/{pk}"
         return test_app.get(path, status=200)
 
     def _check_link(self, test_app, resp, item, table, status):
-        link = resp.html.select_one(".form-group.item-{} a".format(item))
-        assert re.match(r"http://localhost/admin/{}/\d+".format(table), link["href"]) is not None
+        link = resp.html.select_one(f".form-group.item-{item} a")
+        assert re.match(rf"http://localhost/admin/{table}/\d+", link["href"]) is not None
         test_app.get(link.get("href"), status=status)
 
     def test_layer_wms_edit(self, edit_url_test_data, test_app):