Support to the last versions of the django-bootstrap3-datetimepicker

django-inplaceedit · Aug 30, 2015 · dfbc8b2 · dfbc8b2
1 parent 40b6058
commit dfbc8b2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/inplaceeditform_bootstrap/fields.py b/inplaceeditform_bootstrap/fields.py
@@ -57,7 +57,7 @@ def render_value_edit(self):
             if getattr(self.request, 'inplace_js_extra', None) is None:
                 self.request.inplace_js_extra = ''
             scripts = ''.join(field.field.widget.media.render_js())
-            if not scripts in self.request.inplace_js_extra:
+            if scripts not in self.request.inplace_js_extra:
                 self.request.inplace_js_extra += scripts
             return value
         return render_to_string('inplaceeditform_bootstrap/adaptor_date/render_value_edit.html',
@@ -76,7 +76,7 @@ def name(self):
     def __init__(self, *args, **kwargs):
         super(AdaptorDateBootStrapField, self).__init__(*args, **kwargs)
         self.filter_render_value = "date:'%s'" % settings.DATE_FORMAT
-        self.options = {"format": "yyyy-MM-dd",
+        self.options = {"format": "YYYY-MM-DD",
                         "pickTime": False}
 
 
@@ -89,4 +89,4 @@ def name(self):
     def __init__(self, *args, **kwargs):
         super(AdaptorDateTimeBootStrapField, self).__init__(*args, **kwargs)
         self.filter_render_value = "date:'%s'" % settings.DATETIME_FORMAT
-        self.options = {}
+        self.options = {"format": "YYYY-MM-DD HH:mm:ss"}