aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--requirements.pip2
-rw-r--r--servo/forms/base.py3
-rw-r--r--servo/forms/orders.py2
3 files changed, 4 insertions, 3 deletions
diff --git a/requirements.pip b/requirements.pip
index 83da2e4..eb46fe6 100644
--- a/requirements.pip
+++ b/requirements.pip
@@ -2,6 +2,7 @@ requests
django-mptt
django-excel
django-countries
+django-bootstrap3
djangorestframework
babel
markdown
@@ -22,4 +23,3 @@ pyexcel-xlsx
pyexcel_text
django-wkhtmltopdf
-e git+git://github.com/filipp/py-gsxws.git#egg=gsxws
--e git+git://github.com/zostera/django-bootstrap3.git#egg=django-bootstrap3
diff --git a/servo/forms/base.py b/servo/forms/base.py
index 64c672f..b59215b 100644
--- a/servo/forms/base.py
+++ b/servo/forms/base.py
@@ -73,7 +73,6 @@ class BaseModelForm(forms.ModelForm):
class SearchFieldInput(forms.TextInput):
def render(self, name, value, attrs=None):
-
field = super(SearchFieldInput, self).render(name, value, attrs)
final_attrs = self.build_attrs(attrs)
@@ -94,7 +93,7 @@ class DatepickerInput(forms.DateInput):
kwargs['format'] = "%Y-%m-%d"
super(DatepickerInput, self).__init__(*args, **kwargs)
- def render(self, name, value, attrs=None):
+ def render(self, name, value, attrs=None, renderer=None):
date_format = "yyyy-MM-dd"
diff --git a/servo/forms/orders.py b/servo/forms/orders.py
index 7b27d0b..ed58754 100644
--- a/servo/forms/orders.py
+++ b/servo/forms/orders.py
@@ -152,6 +152,8 @@ class OrderSearchForm(forms.Form):
label=_('Status older than (days)'),
)
+
def __init__(self, request, *args, **kwargs):
super(OrderSearchForm, self).__init__(*args, **kwargs)
self.fields['location'].queryset = request.user.locations.all()
+