From 8b13768bf93f0f7699f7b4386bb9c3d3e7a61a9f Mon Sep 17 00:00:00 2001 From: Jacob Rief Date: Mon, 11 May 2020 11:37:02 +0200 Subject: [PATCH] fix error in sphinx-build --- docs/changelog.rst | 6 +++--- docs/index.rst | 2 +- docs/reference/catalog.rst | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index c0cc6e921..3f2c6ec48 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -40,8 +40,8 @@ Changelog for django-SHOP * Refactored views for adding product to cart and changing quantity in cart so that the purchasing quantity can not exceed the quantity in stock. * The default commodity product now keeps track of the quantity in stock. -* Changed the signature of the methods :method:`shop.modifiers.base.CartModifierBase.pre_process_cart` - and :method:`shop.modifiers.base.CartModifierBase.pre_process_cart_item` to take an extra boolean +* Changed the signature of the methods :meth:`shop.modifiers.base.CartModifierBase.pre_process_cart` + and :meth:`shop.modifiers.base.CartModifierBase.pre_process_cart_item` to take an extra boolean parameter. * Remove sub-serializer ``availability`` from product, because now it is handled internally by the class :class:`shop.serializers.defaults.catalog.AddToCartSerializer`. @@ -61,7 +61,7 @@ Changelog for django-SHOP 1.0.1 ===== -* Fix error in admin interface for ``Notification``detail view. +* Fix error in admin interface for ``Notification`` detail view. * Refactor all internal model checks to use classmethod ``check()`` provided by Django. diff --git a/docs/index.rst b/docs/index.rst index 83aea180f..589024d12 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -48,7 +48,7 @@ Reference to classes and concepts used in **django-SHOP** reference/deferred-models reference/money-types reference/product-models - reference/stock-management + reference/inventory reference/catalog reference/search reference/filters diff --git a/docs/reference/catalog.rst b/docs/reference/catalog.rst index 288fc71b6..662d7d59f 100644 --- a/docs/reference/catalog.rst +++ b/docs/reference/catalog.rst @@ -200,6 +200,8 @@ To test if that serializer works properly, we can examine the raw content of the appending ``?format=api`` to the URL of our catalog view. This then renders a human readable representation of the context as JSON. +.. _thumb: https://easy-thumbnails.readthedocs.io/en/latest/usage/#thumbnail-tag + Customizing the Product Summary Serializer .......................................... @@ -264,6 +266,7 @@ bigger effort, rather than creating a specific template for each product type. When rendering a product's detail page, the ``ProductRetrieveView`` looks for a template suitable for the given product type, following these rules: + * look for a template named :samp:`{app_label}>/catalog/{product-model-name}-detail.html` [4]_ [5]_, otherwise * look for a template named :samp:`{app_label}/catalog/product-detail.html` [4]_, otherwise