Merge branch 'master' into ecopole

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 = \