Merge branch 'develop' into 'master'

GDPR kaehmy

See merge request vtmk/web2.0!128
This commit is contained in:
Aarni Halinen
2018-10-20 23:00:59 +03:00
2 changed files with 6 additions and 0 deletions
+5
View File
@@ -72,6 +72,11 @@
</div>
{% bootstrap_field form.text %}
<input type="checkbox" required name="gdpr" value="1">
<span>{% blocktrans %}
Hyväksyn <a href="https://sik.ayy.fi/files/official/Tietosuojaseloste%20%E2%80%93%20Toimihenkil%C3%B6ksi%20hakemisen%20rekisteri.pdf" target="_blank">tietosuojaselosteen</a> ja tietojeni tallentamisen.
{% endblocktrans %}
</span>
{% buttons %}
<button type="submit" class="btn btn-primary">
{% trans "Submit" %}
+1
View File
@@ -155,6 +155,7 @@ def submit(request, *args, **kwargs):
@require_http_methods(['GET'])
@login_required(login_url='/admin/login')
def export_view(request, *args, **kwargs):
def make_table(queryset):
table = ExportTable(queryset,