From fe2888c9a60ce42e399115aa176c8037c460c169 Mon Sep 17 00:00:00 2001 From: Pablo Moreno Date: Mon, 16 Dec 2024 09:54:59 +0100 Subject: [PATCH] fix: added context processor --- .github/workflows/runtests.yml | 7 ++++++- .gitignore | 1 + config/settings/base.py | 1 + shop/models.py | 15 ++++++++++----- web/context_processors.py | 8 ++++++++ web/templates/components/generic/navbar.html | 3 +-- web/templates/users/login.html | 3 +-- web/templatetags/__init__.py | 0 web/templatetags/web.py | 13 ------------- 9 files changed, 28 insertions(+), 23 deletions(-) create mode 100644 web/context_processors.py delete mode 100644 web/templatetags/__init__.py delete mode 100644 web/templatetags/web.py diff --git a/.github/workflows/runtests.yml b/.github/workflows/runtests.yml index 411272a..358f86f 100644 --- a/.github/workflows/runtests.yml +++ b/.github/workflows/runtests.yml @@ -20,9 +20,14 @@ jobs: env: DJANGO_SETTINGS_MODULE: config.settings DEBUG: True - run: pytest --cov && coverage xml + run: pytest --cov --junitxml=junit.xml -o junit_family=legacy && coverage xml - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v4.0.1 with: token: ${{ secrets.CODECOV_TOKEN }} slug: pablo-moreno/shoppy + - name: Upload test results to Codecov + if: ${{ !cancelled() }} + uses: codecov/test-results-action@v1 + with: + token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.gitignore b/.gitignore index ab7462c..c1bbd99 100644 --- a/.gitignore +++ b/.gitignore @@ -160,5 +160,6 @@ data/ /static/ *.db +junit.xml # End of https://www.toptal.com/developers/gitignore/api/django diff --git a/config/settings/base.py b/config/settings/base.py index 67dc186..a0e4417 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -77,6 +77,7 @@ TEMPLATES = [ "django.template.context_processors.request", "django.contrib.auth.context_processors.auth", "django.contrib.messages.context_processors.messages", + "web.context_processors.web_settings", ], }, }, diff --git a/shop/models.py b/shop/models.py index 983313b..b42f03d 100644 --- a/shop/models.py +++ b/shop/models.py @@ -320,9 +320,7 @@ class Order(TimestampedModel): default=Decimal("0"), max_digits=13, decimal_places=2, verbose_name=_("total") ) - user = models.ForeignKey( - User, on_delete=models.PROTECT, verbose_name=_("cliente") - ) + user = models.ForeignKey(User, on_delete=models.PROTECT, verbose_name=_("cliente")) # Billing information billing_address = models.CharField( @@ -437,14 +435,21 @@ class CustomerAddress(models.Model): max_length=64, blank=False, null=False, verbose_name=_("provincia") ) address_country = models.CharField( - max_length=64, default=settings.SHOP_COUNTRY, blank=False, null=False, verbose_name=_("país") + max_length=64, + default=settings.SHOP_COUNTRY, + blank=False, + null=False, + verbose_name=_("país"), ) address_phone = models.CharField( max_length=16, blank=True, null=True, default="", verbose_name=_("teléfono") ) address_type = models.CharField( - max_length=4, choices=Types.choices, default=Types.SHIPPING, verbose_name=_("tipo de dirección") + max_length=4, + choices=Types.choices, + default=Types.SHIPPING, + verbose_name=_("tipo de dirección"), ) default = models.BooleanField(default=True) diff --git a/web/context_processors.py b/web/context_processors.py new file mode 100644 index 0000000..7f34bd4 --- /dev/null +++ b/web/context_processors.py @@ -0,0 +1,8 @@ +from web.models import WebSettings + + +def web_settings(request): + settings = WebSettings.load() + return { + "logo": settings.logo.url if settings.logo else "", + } diff --git a/web/templates/components/generic/navbar.html b/web/templates/components/generic/navbar.html index 88b0971..58f6a06 100644 --- a/web/templates/components/generic/navbar.html +++ b/web/templates/components/generic/navbar.html @@ -1,6 +1,5 @@ {% load i18n %} {% load static %} -{% load web %}