From 8aa68d811a9fc7554e52b78ac04e9c601906c36f Mon Sep 17 00:00:00 2001 From: Jean-Baptiste <bleme@pm.me> Date: Tue, 27 Aug 2019 12:37:23 +0200 Subject: [PATCH] update: improve Model methods --- djangoldp/models.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/djangoldp/models.py b/djangoldp/models.py index 3c1afbbb..7507c0bf 100644 --- a/djangoldp/models.py +++ b/djangoldp/models.py @@ -34,9 +34,16 @@ class Model(models.Model): def get_container_id(self): return Model.container_id(self) + @classonlymethod + def resource(cls, instance_or_model): + if isinstance(instance_or_model, ModelBase): + return cls.container_id(instance_or_model) + else: + return cls.resource_id(instance_or_model) + @classonlymethod def resource_id(cls, instance): - r_id = "{}{}".format(cls.container_id(instance), getattr(instance, cls.slug_field(instance))) + r_id = "{}{}".format(cls.container_id(instance), getattr(instance, cls.slug_field(instance), "")) return cls.__clean_path(r_id) @classonlymethod -- GitLab