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

c2cgeoportal_admin/views/ogc_servers.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
@@ -29,12 +27,18 @@
 
 
 from functools import partial
+from typing import Any, Dict, List, cast
 
 from c2cgeoform.schema import GeoFormSchemaNode
-from c2cgeoform.views.abstract_views import AbstractViews, ListField
+from c2cgeoform.views.abstract_views import AbstractViews, ItemAction, ListField, UserMessage
 from deform.widget import FormWidget
+from pyramid.httpexceptions import HTTPNotFound
 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_commons.lib.literal import Literal
 from c2cgeoportal_commons.models.main import OGCServer
 
 _list_field = partial(ListField, OGCServer)
@@ -44,7 +48,9 @@ base_schema.add_unique_validator(OGCServer.name, OGCServer.id)
 
 
 @view_defaults(match_param="table=ogc_servers")
-class OGCServerViews(AbstractViews):
+class OGCServerViews(AbstractViews):  # type: ignore
+    """The OGC server administration view."""
+
     _list_fields = [
         _list_field("id"),
         _list_field("name"),
@@ -61,28 +67,125 @@ class OGCServerViews(AbstractViews):
     _model = OGCServer
     _base_schema = base_schema
 
-    @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2")
-    def index(self):
-        return super().index()
-
-    @view_config(route_name="c2cgeoform_grid", renderer="fast_json")
-    def grid(self):
-        return super().grid()
-
-    @view_config(route_name="c2cgeoform_item", request_method="GET", renderer="../templates/edit.jinja2")
-    def view(self):
-        return super().edit()
-
-    @view_config(route_name="c2cgeoform_item", request_method="POST", renderer="../templates/edit.jinja2")
-    def save(self):
-        return super().save()
-
-    @view_config(route_name="c2cgeoform_item", request_method="DELETE", renderer="fast_json")
-    def delete(self):
-        return super().delete()
+    MSG_COL = {
+        **AbstractViews.MSG_COL,
+        "cannot_delete": UserMessage(
+            _("Impossible to delete this server while it contains WMS layers."),
+            "alert-danger",
+        ),
+    }
+
+    @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2")  # type: ignore
+    def index(self) -> Dict[str, Any]:
+        return super().index()  # type: ignore
+
+    @view_config(route_name="c2cgeoform_grid", renderer="fast_json")  # type: ignore
+    def grid(self) -> Dict[str, Any]:
+        return super().grid()  # type: ignore
+
+    def schema(self) -> GeoFormSchemaNode:
+        try:
+            obj = self._get_object()
+        except HTTPNotFound:
+            obj = None
+
+        schema = self._base_schema.clone()
+        schema["url"].description = Literal(
+            _("{}<br>Current runtime value is: {}").format(
+                schema["url"].description,
+                obj.url_description(self._request),
+            )
+        )
+        schema["url_wfs"].description = Literal(
+            _("{}<br>Current runtime value is: {}").format(
+                schema["url_wfs"].description,
+                obj.url_wfs_description(self._request),
+            )
+        )
+        return schema
+
+    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="synchronize",
+                    label=_("Synchronize"),
+                    icon="glyphicon glyphicon-import",
+                    url=self._request.route_url("ogcserver_synchronize", id=getattr(item, self._id_field)),
+                ),
+            )
+        return actions
+
+    @view_config(  # type: ignore
+        route_name="c2cgeoform_item", request_method="GET", renderer="../templates/edit.jinja2"
+    )
+    def view(self) -> Dict[str, Any]:
+        return super().edit(self.schema())  # type: ignore
 
-    @view_config(
+    @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
+
+    @view_config(route_name="c2cgeoform_item", request_method="DELETE", renderer="fast_json")  # type: ignore
+    def delete(self) -> Dict[str, Any]:
+        obj = self._get_object()
+        if len(obj.layers) > 0:
+            return {
+                "success": True,
+                "redirect": self._request.route_url(
+                    "c2cgeoform_item",
+                    action="edit",
+                    id=obj.id,
+                    _query=[("msg_col", "cannot_delete")],
+                ),
+            }
+        return super().delete()  # type: ignore
+
+    @view_config(  # type: ignore
         route_name="c2cgeoform_item_duplicate", request_method="GET", renderer="../templates/edit.jinja2"
     )
-    def duplicate(self):
-        return super().duplicate()
+    def duplicate(self) -> Dict[str, Any]:
+        return super().duplicate()  # type: ignore
+
+    @view_config(  # type: ignore
+        route_name="ogcserver_synchronize", renderer="../templates/ogcserver_synchronize.jinja2"
+    )
+    def synchronize(self) -> Dict[str, Any]:
+        obj = self._get_object()
+
+        if self._request.method == "GET":
+            return {
+                "ogcserver": obj,
+                "success": None,
+                "report": None,
+            }
+
+        if self._request.method == "POST":
+            force_parents = self._request.POST.get("force-parents", "false") == "on"
+            force_ordering = self._request.POST.get("force-ordering", "false") == "on"
+            clean = self._request.POST.get("clean", "false") == "on"
+
+            synchronizer = OGCServerSynchronizer(
+                self._request,
+                obj,
+                force_parents=force_parents,
+                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()
+            return {
+                "ogcserver": obj,
+                "success": True,
+                "report": synchronizer.report(),
+            }
+
+        return {}

c2cgeoportal_admin/views/restriction_areas.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
@@ -30,24 +28,68 @@
 
 from functools import partial
 
-from c2cgeoform.schema import GeoFormSchemaNode
+import colander
+from c2cgeoform.schema import GeoFormManyToManySchemaNode, GeoFormSchemaNode
 from c2cgeoform.views.abstract_views import AbstractViews, 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_commons.models.main import RestrictionArea
+from c2cgeoportal_admin.schemas.treegroup import treeitem_edit_url
+from c2cgeoportal_admin.widgets import ChildrenWidget, ChildWidget
+from c2cgeoportal_commons.models.main import Layer, RestrictionArea
 
 _list_field = partial(ListField, RestrictionArea)
 
 base_schema = GeoFormSchemaNode(RestrictionArea, widget=FormWidget(fields_template="restriction_area_fields"))
-base_schema.add_before("area", roles_schema_node("roles"))
+base_schema.add_before("area", roles_schema_node(RestrictionArea.roles))
 base_schema.add_unique_validator(RestrictionArea.name, RestrictionArea.id)
 
 
+def layers(node, kw):  # pylint: disable=unused-argument
+    """Get the layers serializable representation."""
+    dbsession = kw["request"].dbsession
+    query = dbsession.query(Layer).order_by(Layer.name)
+    return [
+        {
+            "id": layer.id,
+            "label": layer.name,
+            "icon_class": f"icon-{layer.item_type}",
+            "edit_url": treeitem_edit_url(kw["request"], layer),
+            "group": "All",
+        }
+        for layer in query
+    ]
+
+
+base_schema.add(
+    colander.SequenceSchema(
+        GeoFormManyToManySchemaNode(
+            Layer,
+            name="layer",
+            includes=["id"],
+            widget=ChildWidget(
+                input_name="id",
+                model=Layer,
+                label_field="name",
+                icon_class=lambda layer: f"icon-{layer.item_type}",
+                edit_url=treeitem_edit_url,
+            ),
+        ),
+        name="layers",
+        title=RestrictionArea.layers.info["colanderalchemy"]["title"],
+        description=RestrictionArea.layers.info["colanderalchemy"]["description"],
+        candidates=colander.deferred(layers),
+        widget=ChildrenWidget(child_input_name="id", orderable=False),
+    )
+)
+
+
 @view_defaults(match_param="table=restriction_areas")
-class RestrictionAreaViews(AbstractViews):
+class RestrictionAreaViews(AbstractViews):  # type: ignore
+    """The restriction area administration view."""
+
     _list_fields = [
         _list_field("id"),
         _list_field("name"),
@@ -59,7 +101,7 @@ class RestrictionAreaViews(AbstractViews):
         _list_field(
             "layers",
             renderer=lambda restriction_area: ", ".join(
-                "{}-{}".format(l.item_type, l.name) or "" for l in restriction_area.layers
+                f"{layer.item_type}-{layer.name}" or "" for layer in restriction_area.layers
             ),
         ),
     ]

c2cgeoportal_admin/views/roles.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
@@ -30,7 +28,8 @@
 
 from functools import partial
 
-from c2cgeoform.schema import GeoFormSchemaNode
+import colander
+from c2cgeoform.schema import GeoFormManyToManySchemaNode, GeoFormSchemaNode
 from c2cgeoform.views.abstract_views import AbstractViews, ListField
 from deform.widget import FormWidget
 from pyramid.view import view_config, view_defaults
@@ -38,25 +37,78 @@ 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.widgets import ChildrenWidget, ChildWidget
 from c2cgeoportal_commons.models.main import Role
+from c2cgeoportal_commons.models.static import User
 
 _list_field = partial(ListField, Role)
 
 base_schema = GeoFormSchemaNode(Role, widget=FormWidget(fields_template="role_fields"))
-base_schema.add_before("extent", functionalities_schema_node.clone())
-base_schema.add_before("extent", restrictionareas_schema_node.clone())
+base_schema.add_before("extent", functionalities_schema_node(Role.functionalities, Role))
+base_schema.add_before("extent", restrictionareas_schema_node(Role.restrictionareas))
 base_schema.add_unique_validator(Role.name, Role.id)
 
 
+def users(node, kw):  # pylint: disable=unused-argument
+    """Get the user serializable metadata."""
+    dbsession = kw["request"].dbsession
+    query = dbsession.query(User).order_by(User.username)
+    return [
+        {
+            "id": user.id,
+            "label": user.username,
+            "icon_class": "icon-user",
+            "edit_url": kw["request"].route_url(
+                "c2cgeoform_item",
+                table="users",
+                id=user.id,
+            ),
+            "group": "All",
+        }
+        for user in query
+    ]
+
+
+base_schema.add(
+    colander.SequenceSchema(
+        GeoFormManyToManySchemaNode(
+            User,
+            name="user",
+            includes=["id"],
+            widget=ChildWidget(
+                input_name="id",
+                model=User,
+                label_field="username",
+                icon_class=lambda user: "icon-user",
+                edit_url=lambda request, user: request.route_url(
+                    "c2cgeoform_item",
+                    table="users",
+                    id=user.id,
+                ),
+            ),
+        ),
+        name=Role.users.key,
+        title=Role.users.info["colanderalchemy"]["title"],
+        description=Role.users.info["colanderalchemy"]["description"],
+        candidates=colander.deferred(users),
+        widget=ChildrenWidget(child_input_name="id", orderable=False, category="structural"),
+    )
+)
+# Not possible to overwrite this in constructor.
+base_schema["users"].children[0].description = ""
+
+
 @view_defaults(match_param="table=roles")
-class RoleViews(AbstractViews):
+class RoleViews(AbstractViews):  # type: ignore
+    """The roles administration view."""
+
     _list_fields = [
         _list_field("id"),
         _list_field("name"),
         _list_field("description"),
         _list_field(
             "functionalities",
-            renderer=lambda role: ", ".join(["{}={}".format(f.name, f.value) for f in role.functionalities]),
+            renderer=lambda role: ", ".join([f"{f.name}={f.value}" for f in role.functionalities]),
         ),
         _list_field(
             "restrictionareas", renderer=lambda role: ", ".join([r.name or "" for r in role.restrictionareas])

c2cgeoportal_admin/views/themes.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
@@ -29,7 +27,9 @@
 
 
 from functools import partial
+from typing import Optional, cast
 
+import sqlalchemy
 from c2cgeoform.schema import GeoFormSchemaNode
 from c2cgeoform.views.abstract_views import ListField
 from deform.widget import FormWidget
@@ -39,7 +39,7 @@ from sqlalchemy.sql.functions import concat
 
 from c2cgeoportal_admin.schemas.functionalities import functionalities_schema_node
 from c2cgeoportal_admin.schemas.interfaces import interfaces_schema_node
-from c2cgeoportal_admin.schemas.metadata import metadatas_schema_node
+from c2cgeoportal_admin.schemas.metadata import metadata_schema_node
 from c2cgeoportal_admin.schemas.roles import roles_schema_node
 from c2cgeoportal_admin.schemas.treegroup import children_schema_node
 from c2cgeoportal_admin.views.treeitems import TreeItemViews
@@ -49,15 +49,16 @@ _list_field = partial(ListField, Theme)
 
 base_schema = GeoFormSchemaNode(Theme, widget=FormWidget(fields_template="theme_fields"))
 base_schema.add(children_schema_node(only_groups=True))
-base_schema.add(functionalities_schema_node.clone())
-base_schema.add(roles_schema_node("restricted_roles"))
-base_schema.add(interfaces_schema_node.clone())
-base_schema.add(metadatas_schema_node.clone())
+base_schema.add(functionalities_schema_node(Theme.functionalities, Theme))
+base_schema.add(roles_schema_node(Theme.restricted_roles))
+base_schema.add(interfaces_schema_node(Theme.interfaces))
+base_schema.add(metadata_schema_node(Theme.metadatas, Theme))
 base_schema.add_unique_validator(Theme.name, Theme.id)
 
 
 @view_defaults(match_param="table=themes")
 class ThemeViews(TreeItemViews):
+    """The theme administration view."""
 
     _list_fields = (
         TreeItemViews._list_fields
@@ -69,8 +70,8 @@ class ThemeViews(TreeItemViews):
                 "functionalities",
                 renderer=lambda themes: ", ".join(
                     [
-                        "{}={}".format(f.name, f.value)
-                        for f in sorted(themes.functionalities, key=lambda f: f.name)
+                        f"{f.name}={f.value}"
+                        for f in sorted(themes.functionalities, key=lambda f: cast(str, f.name))
                     ]
                 ),
                 filter_column=concat(Functionality.name, "=", Functionality.value),
@@ -83,7 +84,7 @@ class ThemeViews(TreeItemViews):
             _list_field(
                 "interfaces",
                 renderer=lambda themes: ", ".join(
-                    [i.name or "" for i in sorted(themes.interfaces, key=lambda i: i.name)]
+                    [i.name or "" for i in sorted(themes.interfaces, key=lambda i: cast(str, i.name))]
                 ),
                 filter_column=Interface.name,
             ),
@@ -95,13 +96,13 @@ class ThemeViews(TreeItemViews):
     _model = Theme
     _base_schema = base_schema
 
-    def _base_query(self, query=None):
+    def _base_query(self, query: Optional[sqlalchemy.orm.query.Query] = None) -> sqlalchemy.orm.query.Query:
         return super()._base_query(
             self._request.dbsession.query(Theme)
             .distinct()
             .outerjoin("interfaces")
-            .outerjoin("restricted_roles")
-            .outerjoin("functionalities")
+            .outerjoin(Theme.restricted_roles)
+            .outerjoin(Theme.functionalities)
             .options(subqueryload("functionalities"))
             .options(subqueryload("restricted_roles"))
             .options(subqueryload("interfaces"))

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
@@ -28,20 +26,22 @@
 # either expressed or implied, of the FreeBSD Project.
 
 
+import colander
 from c2cgeoform.schema import GeoFormSchemaNode
 from c2cgeoform.views.abstract_views import AbstractViews
-import colander
 from deform import ValidationFailure
 from pyramid.httpexceptions import HTTPFound
 from pyramid.view import view_config
-from sqlalchemy.sql.expression import literal_column
 
 from c2cgeoportal_admin import _
-from c2cgeoportal_admin.widgets import ChildrenWidget, ThemeOrderWidget
-from c2cgeoportal_commons.models.main import Theme
+from c2cgeoportal_admin.schemas.treegroup import treeitem_edit_url
+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)
@@ -49,30 +49,50 @@ class ThemeOrderSchema(GeoFormSchemaNode):  # pylint: disable=abstract-method
 
 
 @colander.deferred
-def treeitems(node, kw):  # pylint: disable=unused-argument
-    return kw["dbsession"].query(Theme, literal_column("0")).order_by(Theme.ordering, Theme.name)
+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": 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, dummy in node.treeitems]:
+        if not dict_["id"] in [item["id"] for item in node.candidates]:
             raise colander.Invalid(
                 node,
-                _("Value {} does not exist in table {}").format(dict_["treeitem_id"], Theme.__tablename__),
+                _("Value {} does not exist in table {}").format(dict_["id"], Theme.__tablename__),
             )
 
 
-class ThemesOrderingSchema(colander.MappingSchema):
+class ThemesOrderingSchema(colander.MappingSchema):  # type: ignore
+    """The theme ordering schema."""
+
     themes = colander.SequenceSchema(
-        ThemeOrderSchema(Theme, includes=["id", "ordering"], name="theme", widget=ThemeOrderWidget()),
+        ThemeOrderSchema(
+            Theme,
+            includes=["id", "ordering"],
+            name="theme",
+            widget=ChildWidget(
+                input_name="id",
+                model=TreeItem,
+                label_field="name",
+                icon_class=lambda item: f"icon-{item.item_type}",
+                edit_url=treeitem_edit_url,
+            ),
+        ),
         name="themes",
-        treeitems=treeitems,
+        candidates=themes,
         validator=themes_validator,
-        widget=ChildrenWidget(add_subitem=False, category="structural"),
+        widget=ChildrenWidget(child_input_name="id", add_subitem=False, orderable=True),
     )
 
 
-class ThemesOrdering(AbstractViews):
+class ThemesOrdering(AbstractViews):  # type: ignore
+    """The theme ordering admin view."""
 
     _base_schema = ThemesOrderingSchema()
 
@@ -82,7 +102,7 @@ class ThemesOrdering(AbstractViews):
         dict_ = {
             "themes": [
                 form.schema["themes"].children[0].dictify(theme)
-                for theme, dummy in form.schema["themes"].treeitems
+                for theme in self._request.dbsession.query(Theme).order_by(Theme.ordering)
             ]
         }
         return {

c2cgeoportal_admin/views/treeitems.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
@@ -30,6 +28,7 @@
 
 from functools import partial
 
+import sqlalchemy
 from c2cgeoform.views.abstract_views import AbstractViews, ListField
 from pyramid.view import view_config
 from sqlalchemy.orm import subqueryload
@@ -40,7 +39,9 @@ from c2cgeoportal_commons.models.main import LayergroupTreeitem, Metadata, TreeG
 _list_field = partial(ListField, TreeItem)
 
 
-class TreeItemViews(AbstractViews):
+class TreeItemViews(AbstractViews):  # type: ignore
+    """The admin tree item view."""
+
     _list_fields = [
         _list_field("id"),
         _list_field("name"),
@@ -50,9 +51,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 +71,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-2022, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -46,14 +44,16 @@ from c2cgeoportal_commons.models.static import 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(AbstractViews):  # type: ignore
+    """The admin user view."""
+
     _list_fields = [
         _list_field("id"),
         _list_field("username"),
@@ -119,6 +119,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