diff --git a/djangoldp/models.py b/djangoldp/models.py index f63ffd4b353cfe20a4f157ebb477cbce7549d56c..0bef4dcf8424df51df836fd9c599de616252063f 100644 --- a/djangoldp/models.py +++ b/djangoldp/models.py @@ -27,6 +27,8 @@ class Model(models.Model): def container_id(cls, instance): if isinstance(instance, cls): path = instance.container_path + if path is None: + path = "{}s".format(instance._meta.object_name.lower()) else: view_name = '{}-list'.format(instance._meta.object_name.lower()) path = get_resolver().reverse(view_name) diff --git a/djangoldp/tests/models.py b/djangoldp/tests/models.py index 2622673f0cd3a3873b2d7e0d592b6a601414b66e..a68a803c1f26baa1bdb47ddd2c22706666b4c07f 100644 --- a/djangoldp/tests/models.py +++ b/djangoldp/tests/models.py @@ -31,5 +31,4 @@ class Dummy(models.Model): class LDPDummy(Model): some = models.CharField(max_length=255, blank=True, null=True) - container_path = "ldp-dummys" diff --git a/djangoldp/tests/tests_ldp_model.py b/djangoldp/tests/tests_ldp_model.py index 56bbe55206c0d95c7c90e998ecbda3ad49eb326b..6400378cee8383cd39bf1fc0ff30d5cc45204630 100644 --- a/djangoldp/tests/tests_ldp_model.py +++ b/djangoldp/tests/tests_ldp_model.py @@ -15,10 +15,10 @@ class LDPModelTest(TestCase): def test_class_inheriting_ldp_model(self): dummy = LDPDummy.objects.create(some="text") - self.assertEquals("/ldp-dummys/", dummy.get_container_id()) - self.assertEquals("/ldp-dummys/{}".format(dummy.pk), dummy.get_absolute_url()) - self.assertEquals("/ldp-dummys/", Model.container_id(dummy)) - self.assertEquals("/ldp-dummys/{}".format(dummy.pk), Model.resource_id(dummy)) + self.assertEquals("/ldpdummys/", dummy.get_container_id()) + self.assertEquals("/ldpdummys/{}".format(dummy.pk), dummy.get_absolute_url()) + self.assertEquals("/ldpdummys/", Model.container_id(dummy)) + self.assertEquals("/ldpdummys/{}".format(dummy.pk), Model.resource_id(dummy)) def test_from_resolve_id(self): saved_instance = Dummy.objects.create(some="text")