Hopiu/django-constance
1
0
Fork 0
mirror of https://github.com/jazzband/django-constance.git synced 2026-03-16 22:40:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #243 from whs/master

Browse source 
Fix Reset to default for DateTime, #185
This commit is contained in:
Camilo Nova 2017-11-08 08:31:44 -05:00 committed by GitHub
commit 3f6b694f74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
constance/admin.py
View file

@ -195,6 +195,7 @@ class ConstanceAdmin(admin.ModelAdmin):
'form_field': form[name],
'is_checkbox': isinstance(
form[name].field.widget, forms.CheckboxInput),
'is_datetime': isinstance(default, datetime),
}
return config_value

8
constance/static/admin/js/constance.js
View file

@ -2,13 +2,19 @@
'use strict';
$(function() {
$('#content-main').on('click', '.reset-link', function(e) {
e.preventDefault();
var field = $('#' + this.dataset.fieldId);
var fieldType = this.dataset.fieldType;
if (field.attr('type') === 'checkbox') {
if (fieldType === 'checkbox') {
field.prop('checked', this.dataset.default === 'true');
} else if (fieldType === 'datetime') {
var defaultDate = new Date(this.dataset.default * 1000);
$('#' + this.dataset.fieldId + '_0').val(defaultDate.strftime(get_format('DATE_INPUT_FORMATS')[0]));
$('#' + this.dataset.fieldId + '_1').val(defaultDate.strftime(get_format('TIME_INPUT_FORMATS')[0]));
} else {
field.val(this.dataset.default);
}

13
constance/templates/admin/constance/includes/results_list.html
View file

@ -20,9 +20,18 @@
{{ item.form_field.errors }}
{{ item.form_field }}
<br>
<a href="#" class="reset-link" data-field-id="{{ item.form_field.auto_id }}" data-default="{% spaceless %}
<a href="#" class="reset-link"
data-field-id="{{ item.form_field.auto_id }}"
data-field-type="{% spaceless %}
{% if item.is_checkbox %}checkbox
{% elif item.is_datetime %}datetime
{% endif %}
{% endspaceless %}"
data-default="{% spaceless %}
{% if item.is_checkbox %}{% if item.raw_default %} true {% else %} false {% endif %}
{% else %}{{ item.default }}{% endif %}
{% elif item.is_datetime %}{{ item.raw_default|date:"U" }}
{% else %}{{ item.default }}
{% endif %}
{% endspaceless %}">Reset to default</a>
</td>
<td>