Merge pull request #283 from myii/myii-patch-1

Improve consistency of reset value handling for `date`
jazzband · May 12, 2018 · fd7c4e8 · fd7c4e8
2 parents df30bcd + c9916c7
commit fd7c4e8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/constance/static/admin/js/constance.js b/constance/static/admin/js/constance.js
@@ -11,6 +11,9 @@
 
             if (fieldType === 'checkbox') {
                 field.prop('checked', this.dataset.default === 'true');
+            } else if (fieldType === 'date') {
+                var defaultDate = new Date(this.dataset.default * 1000);
+                $('#' + this.dataset.fieldId).val(defaultDate.strftime(get_format('DATE_INPUT_FORMATS')[0]));}
             } 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]));

diff --git a/constance/templates/admin/constance/includes/results_list.html b/constance/templates/admin/constance/includes/results_list.html
@@ -25,13 +25,14 @@
                 data-field-id="{{ item.form_field.auto_id }}"
                 data-field-type="{% spaceless %}
                 {% if item.is_checkbox %}checkbox
+                {% elif item.is_date %}date
                 {% elif item.is_datetime %}datetime
                 {% endif %}
                 {% endspaceless %}"
                 data-default="{% spaceless %}
                 {% if item.is_checkbox %}{% if item.raw_default %} true {% else %} false {% endif %}
+                {% elif item.is_date %}{{ item.raw_default|date:"U" }}
                 {% elif item.is_datetime %}{{ item.raw_default|date:"U" }}
-                {% elif item.is_date %}{{ item.raw_default.isoformat }}
                 {% else %}{{ item.default }}
                 {% endif %}
                 {% endspaceless %}">{% trans "Reset to default" %}</a>