Skip to content

Commit c18442d

Browse files
committed
allow clear of auto generated screenshot with clear checkbox
1 parent ef67d67 commit c18442d

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

django/gsmap/models.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,12 @@ def data_changed(self, fields):
127127
if not self.pk or not self._old_values:
128128
return True
129129

130+
changed_list = []
130131
for field in fields:
131132
if getattr(self, field) != self._old_values[field]:
132-
return True
133-
return False
133+
changed_list.append(True)
134+
changed_list.append(False)
135+
return any(changed_list)
134136
return True
135137

136138
@property
@@ -189,7 +191,8 @@ def save_screenshot_handler(sender, **kwargs):
189191
def save_screenshot():
190192
post_save.disconnect(save_screenshot_handler, sender=Snapshot)
191193
instance = kwargs.get('instance')
192-
if instance.data_changed(['data']): # only create snapshot if data changed
194+
# only create snapshot if data changed
195+
if instance.data_changed(['data', 'screenshot_generated', 'thumbnail_generated']):
193196
try:
194197
# disconnect to break save recursive loop
195198
post_save.disconnect(save_screenshot_handler, sender=Snapshot)

django/main/templates/admin/base_site.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22

33
{% block extrastyle %}
44
<style>
5-
#thumbnail_generated-clear_id, label[for='thumbnail_generated-clear_id'], #id_thumbnail_generated,
6-
#screenshot_generated-clear_id, label[for='screenshot_generated-clear_id'], #id_screenshot_generated {
7-
display: none;
8-
}
9-
.field-thumbnail_generated .clearable-file-input, .field-screenshot_generated .clearable-file-input {
5+
#id_thumbnail_generated, #id_screenshot_generated {
106
display: none;
117
}
128
</style>

0 commit comments

Comments
 (0)