2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-07-17 18:26:32 +00:00

Base URL configuration options (#4749)

* Improve construct_absolute_url method

- Look for hard-coded site URL if provided
- Otherwise look for specified site URL
- Otherwise look at the provided request object

* Refactor existing code which used base URL setting

* Update docs

* Validate that a provided base URL is valid
This commit is contained in:
Oliver
2023-05-02 22:14:57 +10:00
committed by GitHub
parent 10c3d101e8
commit 61d613ff34
9 changed files with 75 additions and 33 deletions

View File

@@ -13,10 +13,9 @@ from django.template.loader import render_to_string
from django.urls import reverse
from django.utils.translation import gettext_lazy as _
import common.models
import part.models
import stock.models
from InvenTree.helpers import normalize, validateFilterString
from InvenTree.helpers import get_base_url, normalize, validateFilterString
from InvenTree.models import MetadataMixin
from plugin.registry import registry
@@ -183,7 +182,7 @@ class LabelTemplate(MetadataMixin, models.Model):
context = self.get_context_data(request)
# Add "basic" context data which gets passed to every label
context['base_url'] = common.models.InvenTreeSetting.get_setting('INVENTREE_BASE_URL')
context['base_url'] = get_base_url(request=request)
context['date'] = datetime.datetime.now().date()
context['datetime'] = datetime.datetime.now()
context['request'] = request