From df13768a1642454fc44fc320d8369209073f1201 Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Mon, 3 Sep 2018 18:00:18 +0100
Subject: [PATCH] Improve how no data for files is displayed
---
opentech/apply/stream_forms/blocks.py | 3 +++
.../stream_forms/templates/stream_forms/render_file_field.html | 2 +-
.../templates/stream_forms/render_multi_file_field.html | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/opentech/apply/stream_forms/blocks.py b/opentech/apply/stream_forms/blocks.py
index 117192eeb..ff4120a72 100644
--- a/opentech/apply/stream_forms/blocks.py
+++ b/opentech/apply/stream_forms/blocks.py
@@ -304,6 +304,9 @@ class MultiFileFieldBlock(UploadableMediaBlock):
label = _('Multiple File field')
template = 'stream_forms/render_multi_file_field.html'
+ def no_response(self):
+ return [super().no_response()]
+
class FormFieldsBlock(StreamBlock):
text_markup = RichTextBlock(group=_('Other'), label=_('Paragraph'))
diff --git a/opentech/apply/stream_forms/templates/stream_forms/render_file_field.html b/opentech/apply/stream_forms/templates/stream_forms/render_file_field.html
index 1b7e46cf2..f82f80d25 100644
--- a/opentech/apply/stream_forms/templates/stream_forms/render_file_field.html
+++ b/opentech/apply/stream_forms/templates/stream_forms/render_file_field.html
@@ -1,6 +1,6 @@
{% extends "stream_forms/render_field.html" %}
{% block data_display %}
- {% if data %}
+ {% if data.name %}
<div class="wrapper">
{% include "stream_forms/includes/file_field.html" with file=data %}
</div>
diff --git a/opentech/apply/stream_forms/templates/stream_forms/render_multi_file_field.html b/opentech/apply/stream_forms/templates/stream_forms/render_multi_file_field.html
index 9b089352f..f87d83862 100644
--- a/opentech/apply/stream_forms/templates/stream_forms/render_multi_file_field.html
+++ b/opentech/apply/stream_forms/templates/stream_forms/render_multi_file_field.html
@@ -2,7 +2,7 @@
{% block data_display %}
<div class="wrapper">
{% for file in data %}
- {% include "stream_forms/includes/file_field.html" with file=file %}
+ {% include "stream_forms/includes/file_field.html" with file=file %}
{% endfor %}
</div>
{% endblock %}
--
GitLab