Skip to content

Commit

Permalink
Upgraded to Django 2.1 and had to fork django-jsignature again
Browse files Browse the repository at this point in the history
  • Loading branch information
jsayles committed Jan 3, 2019
1 parent 21960f6 commit 3c31ee5
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 17 deletions.
33 changes: 17 additions & 16 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Core requirements
Django>=2.0,<2.1
Pillow==5.3.0
Django==2.1.4
Pillow==5.4.0
psycopg2==2.7.6.1
django-localflavor==2.1
django-localflavor-us==1.1
django-taggit==0.23.0
django-taggit-templatetags2==1.6.1
django-crontab==0.7.1
python-slugify==1.2.6
python-slugify==2.0.0
pytz==2018.7
requests==2.20.0
requests==2.21.0
setuptools==40.6.3

# Supporting libraries
Expand All @@ -23,30 +23,31 @@ cryptography==2.4.2

# For document signing & PDFs
html5lib==1.0.1
django-jsignature==0.8
weasyprint==0.42.3
weasyprint==44
# Master branch of django-jsignature is very out of date
#django-jsignature==0.8
-e git+https://github.com/nadineproject/django-jsignature.git#egg=django-jsignature


# Libraries for Xero
pyxero==0.9.1
PyJWT==1.6.4
PyJWT==1.7.1

# Libraries for Arpwatch
pysnmp==4.4.4
pysnmp==4.4.8
pysnmp-mibs==0.1.6

# USAePay libraries
# Payment libraries
suds-jurko==0.6

# Stripe libraries
#stripe==2.6.0
stripe==2.17.0

# For the documentation:
sphinx==1.7.6
sphinx-rtd-theme==0.4.1
recommonmark==0.4.0
sphinx==1.8.3
sphinx-rtd-theme==0.4.2
pycodestyle==2.4
Markdown==2.6.11
Markdown==3.0.1
# Must use CommonMark 0.5.4 for ReadTheDocs!
recommonmark==0.4.0
CommonMark==0.5.4

# A few handy tools
Expand Down
3 changes: 2 additions & 1 deletion tablet/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,8 @@ def signature_capture(request, username, doc_type):
signature_file = form.save_signature()
render_url = reverse('tablet:sig_render', kwargs={'username': user.username, 'doc_type': doc_type, 'signature_file': signature_file}) + "?save_file=True"
return HttpResponseRedirect(render_url)
return render(request, 'tablet/signature_capture.html', {'user': user, 'form': form, 'today': today, 'doc_type': doc_type})
context = {'user': user, 'form': form, 'today': today, 'doc_type': doc_type}
return render(request, 'tablet/signature_capture.html', context)


def signature_render(request, username, doc_type, signature_file):
Expand Down

0 comments on commit 3c31ee5

Please sign in to comment.