summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2013-10-21 19:43:07 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2013-10-21 19:43:07 +0200
commitf59642bd6468123ef572bda7c4487346f4b51d80 (patch)
tree61198d5934f84f4419758d3b011d7a77702bab37
parentb6ce7fe959dec06739dfaaa37e50e882ad6c2d5f (diff)
downloadChimère - projet Saclay-f59642bd6468123ef572bda7c4487346f4b51d80.tar.bz2
Chimère - projet Saclay-f59642bd6468123ef572bda7c4487346f4b51d80.zip
Fix edit route submission error and category filtering on interface
-rw-r--r--forms.py6
-rw-r--r--views.py2
2 files changed, 5 insertions, 3 deletions
diff --git a/forms.py b/forms.py
index ba08786..3e42d66 100644
--- a/forms.py
+++ b/forms.py
@@ -35,7 +35,8 @@ class MarkerForm(BaseMarkerForm):
def __init__(self, *args, **kwargs):
super(MarkerForm, self).__init__(*args, **kwargs)
self.fields['categories'].widget.choices = [('', _(u"Select"))] + \
- SubCategory.getAvailableTuples()
+ SubCategory.getAvailableTuples(item_types=['M', 'B'])
+
def clean_categories(self):
cats = self.cleaned_data.get('categories')
if cats:
@@ -50,7 +51,8 @@ class RouteForm(BaseRouteForm):
def __init__(self, *args, **kwargs):
super(RouteForm, self).__init__(*args, **kwargs)
self.fields['categories'].widget.choices = [('', _(u"Select"))] + \
- SubCategory.getAvailableTuples()
+ SubCategory.getAvailableTuples(item_types=['R', 'B'])
+
def clean_categories(self):
cats = self.cleaned_data.get('categories')
if cats:
diff --git a/views.py b/views.py
index b985342..86b3d61 100644
--- a/views.py
+++ b/views.py
@@ -81,7 +81,7 @@ def edit_route(request, area_name="", item_id=None, submited=False):
Edition page
"""
response, values, sub_categories = get_edit_route(request, area_name,
- item_id, ['M', 'B'])
+ item_id, ['R', 'B'])
if response:
return response
item_id, init_item, response_dct, form, formset_multi, formset_picture = \