udata 10.7.1.dev36357__py2.py3-none-any.whl → 10.7.1.dev36387__py2.py3-none-any.whl

udata/commands/fixtures.py

@@ -74,7 +74,7 @@ UNWANTED_KEYS: dict[str, list[str]] = {
         "preview_url",
         "permissions",
     ],
-    "discussion": ["subject", "url", "class", "permissions"],
+    "discussion": ["subject", "url", "self_web_url", "class", "permissions"],
     "discussion_message": ["permissions"],
     "user": ["uri", "page", "class", "avatar_thumbnail", "email"],
     "posted_by": ["uri", "page", "class", "avatar_thumbnail", "email"],

udata/core/discussions/api.py

@@ -77,6 +77,9 @@ discussion_fields = api.model(
         "url": fields.String(
             attribute=lambda d: d.self_api_url(), description="The discussion API URI"
         ),
+        "self_web_url": fields.String(
+            attribute=lambda d: d.self_web_url(), description="The discussion web URL"
+        ),
         "extras": fields.Raw(description="Extra attributes as key-value pairs"),
         "spam": fields.Nested(spam_fields),
         "permissions": fields.Nested(discussion_permissions_fields),

udata/core/linkable.py

@@ -1,6 +1,10 @@
 class Linkable:
     def _link_id(self, **kwargs):
-        return self.id if kwargs.get("_useId", False) else self.slug
+        if kwargs.get("_useId", False):
+            return self.id
+
+        # Some old/special datasets don't have slug?
+        return self.slug or self.id
 
     def _self_api_url_kwargs(self, **kwargs):
         # Default to external

udata/core/topic/models.py

@@ -60,6 +60,10 @@ class Topic(db.Datetimed, Auditable, db.Document, Owned):
         # There are no metrics on Topic to store discussions count
         pass
 
+    def self_web_url(self, **kwargs):
+        # Useful for Discussions to call self_web_url on their `subject`
+        return None
+
 
 pre_save.connect(Topic.pre_save, sender=Topic)
 post_save.connect(Topic.post_save, sender=Topic)