Skip to content

Commit

Permalink
disable datepicker and update to Django 1.11
Browse files Browse the repository at this point in the history
  • Loading branch information
rloomans committed Jun 14, 2017
1 parent 699a6c3 commit 9d288cf
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
3 changes: 1 addition & 2 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Django==1.10.7
Django==1.11.2
django-bootstrap3==8.2.3
django-bootstrap3-datepicker==0.4.1
dj-database-url==0.4.2
dj-static==0.0.6
django-csp==3.3
Expand Down
7 changes: 1 addition & 6 deletions teamtemp/responses/forms.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import re

import pytz
from bootstrap3_datepicker.widgets import DatePickerInput
from builtins import object
from builtins import str
from django import forms
Expand Down Expand Up @@ -258,11 +257,7 @@ class SurveySettingsForm(forms.ModelForm):
region_names = forms.CharField(widget=forms.TextInput(attrs={'size': '64'}), max_length=64, required=False)
site_names = forms.CharField(widget=forms.TextInput(attrs={'size': '64'}), max_length=64, required=False)
default_tz = forms.ChoiceField(choices=[(x, x) for x in pytz.all_timezones], required=False)
next_archive_date = forms.DateField(widget=DatePickerInput(format="%Y-%m-%d",
options={'autoclose': True, 'startDate': '-1d',
'todayBtn': True, 'todayHighlight': True },
attrs={'autocomplete': 'next-archive-date'}),
required=False)
next_archive_date = forms.DateField(widget=forms.DateInput(attrs={'type': 'date'}, format="%Y-%m-%d"), required=False)

class Meta(object):
model = TeamTemperature
Expand Down
2 changes: 1 addition & 1 deletion teamtemp/templates/set.html
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ <h2>Survey Settings</h2>
{{ form.next_archive_date.errors }}
<div class="field">
<label for="id_next_archive_date">Next Archive Date:</label><br/>
<div class="next_archive_date">{{ form.next_archive_date }}</div> (Date of next automated archive.)
<div class="next_archive_date">{{ form.next_archive_date }}</div> (Date of next automated archive. YYYY-mm-dd)
</div>

{{ form.new_password.errors }}
Expand Down

0 comments on commit 9d288cf

Please sign in to comment.