udata 10.6.1.dev36082__py2.py3-none-any.whl → 10.6.1.dev36098__py2.py3-none-any.whl

udata/core/user/models.py

@@ -7,7 +7,7 @@ from time import time
 
 from authlib.jose import JsonWebSignature
 from blinker import Signal
-from flask import current_app
+from flask import current_app, url_for
 from flask_security import MongoEngineUserDatastore, RoleMixin, UserMixin
 from mongoengine.signals import post_save, pre_save
 from werkzeug.utils import cached_property
@@ -16,12 +16,12 @@ from udata import mail
 from udata.api_fields import field
 from udata.core import storages
 from udata.core.discussions.models import Discussion
+from udata.core.linkable import Linkable
 from udata.core.storages import avatars, default_image_basename
 from udata.frontend.markdown import mdstrip
 from udata.i18n import lazy_gettext as _
-from udata.mail import get_mail_campaign_dict
 from udata.models import Follow, WithMetrics, db
-from udata.uris import endpoint_for
+from udata.uris import cdata_url
 
 from .constants import AVATAR_SIZES
 
@@ -45,7 +45,7 @@ class UserSettings(db.EmbeddedDocument):
     prefered_language = db.StringField()
 
 
-class User(WithMetrics, UserMixin, db.Document):
+class User(WithMetrics, UserMixin, Linkable, db.Document):
     slug = field(
         db.SlugField(max_length=255, required=True, populate_from="fullname"), auditable=False
     )
@@ -133,19 +133,13 @@ class User(WithMetrics, UserMixin, db.Document):
     def sysadmin(self):
         return self.has_role("admin")
 
-    def url_for(self, *args, **kwargs):
-        return endpoint_for("users.show", "api.user", user=self, *args, **kwargs)
+    def self_web_url(self, **kwargs):
+        return cdata_url(f"/users/{self._link_id(**kwargs)}/", **kwargs)
 
-    display_url = property(url_for)
-
-    @property
-    def external_url(self):
-        return self.url_for(_external=True)
-
-    @property
-    def external_url_with_campaign(self):
-        extras = get_mail_campaign_dict()
-        return self.url_for(_external=True, **extras)
+    def self_api_url(self, **kwargs):
+        return url_for(
+            "api.user", user=self._link_id(**kwargs), **self._self_api_url_kwargs(**kwargs)
+        )
 
     @property
     def visible(self):

udata/core/user/rdf.py

@@ -6,7 +6,6 @@ from rdflib import BNode, Graph, Literal, URIRef
 from rdflib.namespace import FOAF, RDF, RDFS
 
 from udata.rdf import namespace_manager
-from udata.uris import endpoint_for
 
 
 def user_to_rdf(user, graph=None):
@@ -15,8 +14,7 @@ def user_to_rdf(user, graph=None):
     """
     graph = graph or Graph(namespace_manager=namespace_manager)
     if user.id:
-        user_url = endpoint_for("users.show_redirect", "api.user", user=user.id, _external=True)
-        id = URIRef(user_url)
+        id = URIRef(user.url_for(_useId=True))
     else:
         id = BNode()
     o = graph.resource(id)

udata/features/territories/models.py

@@ -1,6 +1,3 @@
-from flask import url_for
-
-from udata.mail import get_mail_campaign_dict
 from udata.models import License, Organization
 
 __all__ = ("TerritoryDataset", "ResourceBasedTerritoryDataset", "TERRITORY_DATASETS")
@@ -45,23 +42,10 @@ class ResourceBasedTerritoryDataset(TerritoryDataset):
     csv_column = ""
 
     def url_for(self, external=False):
-        return url_for(
-            "territories.territory_dataset_resource",
-            territory=self.territory,
-            dataset=self.dataset_id,
-            resource_id=self.resource_id,
-            territory_attr=self.territory_attr,
-            csv_column=self.csv_column,
-            _external=external,
-        )
+        return None
 
     url = property(url_for)
 
     @property
     def external_url(self):
         return self.url_for(external=True)
-
-    @property
-    def external_url_with_campaign(self):
-        extras = get_mail_campaign_dict()
-        return self.url_for(_external=True, **extras)

udata/rdf.py

@@ -29,7 +29,6 @@ from udata.frontend.markdown import parse_html
 from udata.models import Schema
 from udata.mongo.errors import FieldValidationError
 from udata.tags import slug as slugify_tag
-from udata.uris import endpoint_for
 
 log = logging.getLogger(__name__)
 
@@ -367,7 +366,7 @@ def contact_points_to_rdf(contacts, graph=None):
     for contact in contacts:
         if contact.id:
             id = URIRef(
-                endpoint_for(
+                url_for(
                     "api.contact_point",
                     contact_point=contact.id,
                     _external=True,

udata/routing.py

@@ -12,7 +12,7 @@ from udata.core.dataservices.models import Dataservice
 from udata.core.spatial.models import GeoZone
 from udata.i18n import ISO_639_1_CODES
 from udata.mongo import db
-from udata.uris import endpoint_for
+from udata.uris import cdata_url, homepage_url
 
 
 class LazyRedirect(object):
@@ -249,4 +249,5 @@ def init_app(app):
     app.url_map.converters["contact_point"] = ContactPointConverter
     app.url_map.converters["report"] = ReportConverter
 
-    app.jinja_env.globals["endpoint_for"] = endpoint_for
+    app.jinja_env.globals["cdata_url"] = cdata_url
+    app.jinja_env.globals["homepage_url"] = homepage_url

udata/settings.py

@@ -24,6 +24,8 @@ class Defaults(object):
     CONTACT_EMAIL = "contact@example.org"
     TERRITORIES_EMAIL = "territories@example.org"
 
+    CDATA_BASE_URL = None
+
     MONGODB_HOST = "mongodb://localhost:27017/udata"
     MONGODB_CONNECT = False  # Lazy connexion for Fork-safe usage