inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-07-01 03:00:54 +00:00
Code Activity

Merge branch 'inventree:master' into matmair/issue2385

Browse Source
This commit is contained in:
Matthias Mair
2022-05-02 21:50:52 +02:00
committed by GitHub
parent e418a54c25 41177f8611
commit 4125803e6d
143 changed files with 39337 additions and 29974 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
InvenTree/plugin/builtin/integration/mixins.py
View File

@ -6,7 +6,7 @@ import logging
import json
import requests
from django.conf.urls import url, include
from django.urls import include, re_path
from django.db.utils import OperationalError, ProgrammingError
from plugin.models import PluginConfig, PluginSetting
@ -303,7 +303,7 @@ class UrlsMixin:
Urlpatterns for this plugin
"""
if self.has_urls:
return url(f'^{self.slug}/', include((self.urls, self.slug)), name=self.slug)
return re_path(f'^{self.slug}/', include((self.urls, self.slug)), name=self.slug)
return None
@property