summaryrefslogtreecommitdiff
path: root/postgresqleu
diff options
context:
space:
mode:
Diffstat (limited to 'postgresqleu')
-rw-r--r--postgresqleu/confreg/views.py7
-rw-r--r--postgresqleu/transferwise/api.py2
2 files changed, 8 insertions, 1 deletions
diff --git a/postgresqleu/confreg/views.py b/postgresqleu/confreg/views.py
index eac66272..9bbe30e1 100644
--- a/postgresqleu/confreg/views.py
+++ b/postgresqleu/confreg/views.py
@@ -1939,6 +1939,12 @@ def callforpapers_edit(request, confname, sessionid):
slidesurlform = SessionSlidesUrlForm()
slidesfileform = SessionSlidesFileForm()
+ feedbackqrcode = None
+ if session.status in (1, 4):
+ # 1 = confirmed, so render
+ # 4 = reserve, so render
+ feedbackqrcode = generate_base64_qr('{0}/events/{1}/feedback/{2}/'.format(settings.SITEBASE, confname, session.id), None, 300)
+
return render_conference_response(request, conference, 'cfp', 'confreg/session_feedback.html', {
'session': session,
'feedbackcount': feedbackcount,
@@ -1949,6 +1955,7 @@ def callforpapers_edit(request, confname, sessionid):
'slidesurlform': slidesurlform,
'slidesfileform': slidesfileform,
'slides': ConferenceSessionSlides.objects.filter(session=session),
+ 'feedbackqrcode': feedbackqrcode,
})
if session.id:
diff --git a/postgresqleu/transferwise/api.py b/postgresqleu/transferwise/api.py
index 86661953..6be5834e 100644
--- a/postgresqleu/transferwise/api.py
+++ b/postgresqleu/transferwise/api.py
@@ -259,7 +259,7 @@ class TransferwiseApi(object):
raise Exception("Failed to parse transferwise amount from '{}'".format(amount))
def strip_tw_tags(self, s):
- return re.subn('</?(strong|positive|negative|strikethrough)>', '', s)
+ return re.subn('</?(strong|positive|negative|strikethrough)>', '', s)[0]
def validate_iban(self, iban):
try: