From ff91c4ec5365f660023f234f699b31d29290efaa Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Mon, 20 Apr 2020 00:10:16 +1000 Subject: [PATCH] Add a new verision of django-qr-code Official package does not (yet) support django 3.0 --- InvenTree/InvenTree/settings.py | 2 +- InvenTree/InvenTree/urls.py | 6 ++---- requirements.txt | 5 ++++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/InvenTree/InvenTree/settings.py b/InvenTree/InvenTree/settings.py index bbd42b957c..fa6bf96ec7 100644 --- a/InvenTree/InvenTree/settings.py +++ b/InvenTree/InvenTree/settings.py @@ -101,7 +101,7 @@ INSTALLED_APPS = [ 'crispy_forms', # Improved form rendering 'import_export', # Import / export tables to file 'django_cleanup', # Automatically delete orphaned MEDIA files - # 'qr_code', # Generate QR codes + 'qr_code', # Generate QR codes 'mptt', # Modified Preorder Tree Traversal 'markdownx', # Markdown editing 'markdownify', # Markdown template rendering diff --git a/InvenTree/InvenTree/urls.py b/InvenTree/InvenTree/urls.py index 53d2d07544..d9600333f4 100644 --- a/InvenTree/InvenTree/urls.py +++ b/InvenTree/InvenTree/urls.py @@ -8,8 +8,7 @@ Passes URL lookup downstream to each app as required. from django.conf.urls import url, include from django.contrib import admin from django.contrib.auth import views as auth_views -# TODO - Remove this line once a new QR solution has been implemented -# from qr_code import urls as qr_code_urls +from qr_code import urls as qr_code_urls from company.urls import company_urls from company.urls import supplier_part_urls @@ -100,8 +99,7 @@ urlpatterns = [ url(r'^admin/', admin.site.urls, name='inventree-admin'), - # TODO - Remove this line! - # url(r'^qr_code/', include(qr_code_urls, namespace='qr_code')), + url(r'^qr_code/', include(qr_code_urls, namespace='qr_code')), url(r'^index/', IndexView.as_view(), name='index'), url(r'^search/', SearchView.as_view(), name='search'), diff --git a/requirements.txt b/requirements.txt index a6c780b6ff..3b58076828 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,10 @@ tablib==0.13.0 # Import / export data files django-crispy-forms==1.8.1 # Form helpers django-import-export==2.0.0 # Data import / export for admin interface django-cleanup==4.0.0 # Manage deletion of old / unused uploaded files -django-qr-code==1.1.0 # Generate QR codes +# TODO: Once the official django-qr-code package has been updated with Django3.x support, +# the following line should be removed. +git+git://github.com/chrissam/django-qr-code +# django-qr-code==1.1.0 # Generate QR codes flake8==3.3.0 # PEP checking coverage==4.0.3 # Unit test coverage python-coveralls==2.9.1 # Coveralls linking (for Travis)