Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a new verision of django-qr-code

Browse Source 
Official package does not (yet) support django 3.0
This commit is contained in:
Oliver Walters 2020-04-20 00:10:16 +10:00
parent 3a64d0bc8f
commit ff91c4ec53
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/InvenTree/settings.py
View File

@ -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

6
InvenTree/InvenTree/urls.py
View File

@ -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'),

5
requirements.txt
View File

@ -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)