Skip to content

Commit 1781100

Browse files
committed
improve fileobject in admin
1 parent 2ce8c95 commit 1781100

3 files changed

Lines changed: 21 additions & 24 deletions

File tree

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
setuptools.setup(
77
name="django-streamfield",
8-
version="1.3.7",
8+
version="1.3.8",
99
author="Yury Lapshinov",
1010
author_email="y.raagin@gmail.com",
1111
description="StreamField for native Django Admin or with Grappelli",

streamfield/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
name = "streamfield"
2-
VERSION = '1.3.7'
2+
VERSION = '1.3.8'
Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,26 @@
11
{% load i18n fb_versions %}
22
{% with field.value as value %}
33

4-
{% if value.filetype == "Image" and value.exists %}
5-
{% version value.path 'admin_thumbnail' as thumbnail_version %}
6-
{% if thumbnail_version %}
7-
<p class="preview" id="preview_{{ final_attrs.id }}">
8-
<a href="{{ value.url }}" target="_blank" id="previewlink_{{ final_attrs.id }}">
9-
<img id="previewimage_{{ final_attrs.id }}" src="{{ thumbnail_version.url }}" class="preview" />
10-
</a>
11-
</p>
4+
{% if value and value.exists %}
5+
{% if value.filetype == "Image" %}
6+
{% version value.path 'admin_thumbnail' as thumbnail_version %}
7+
{% if thumbnail_version %}
8+
<p class="preview" id="preview_{{ final_attrs.id }}">
9+
<a href="{{ value.url }}" target="_blank" id="previewlink_{{ final_attrs.id }}">
10+
<img id="previewimage_{{ final_attrs.id }}" src="{{ thumbnail_version.url }}" class="preview" />
11+
</a>
12+
</p>
13+
{% else %}
14+
<p class="preview" id="preview_{{ final_attrs.id }}" style="display: none;">
15+
<span id="previewlink_{{ final_attrs.id }}">
16+
<img id="previewimage_{{ final_attrs.id }}" class="preview" src="" />
17+
</span>
18+
</p>
19+
{% endif %}
20+
{% else %}
21+
<p><a href="{{ value.url }}">{{ value }}</a></p>
22+
{% endif %}
1223
{% else %}
13-
<p class="preview" id="preview_{{ final_attrs.id }}" style="display: none;">
14-
<span id="previewlink_{{ final_attrs.id }}">
15-
<img id="previewimage_{{ final_attrs.id }}" class="preview" src="" />
16-
</span>
17-
</p>
18-
{% endif %}
19-
{% else %}
20-
<p class="preview" id="preview_{{ final_attrs.id }}" style="display: none;">
21-
<span id="previewlink_{{ final_attrs.id }}">
22-
<img id="previewimage_{{ final_attrs.id }}" class="preview" src="" />
23-
</span>
24-
</p>
25-
{% endif %}
26-
{% if value and not value.exists %}
2724
<ul class="errorlist"><li>{% trans "File not found" %}</li></ul>
2825
{% endif %}
2926
{% endwith %}

0 commit comments

Comments
 (0)