diff options
Diffstat (limited to 'views.py')
| -rw-r--r-- | views.py | 77 |
1 files changed, 40 insertions, 37 deletions
@@ -27,6 +27,7 @@ from chimere.actions import actions from chimere.models import Marker, Route, PropertyModel from chimere.views import get_edit_page, index + def index_saclay(request, area_name=None, default_area=None, simple=False): tpl, response_dct = index(request, area_name, default_area, simple, get_response=True) @@ -37,6 +38,7 @@ def index_saclay(request, area_name=None, default_area=None, simple=False): get_edit_marker = get_edit_page('edit', Marker, MarkerForm) + def edit(request, area_name="", item_id=None, submited=False, event=False): """ Edition page @@ -46,28 +48,28 @@ def edit(request, area_name="", item_id=None, submited=False, event=False): if response: return response item_id, init_item, response_dct, form, formset_multi, formset_picture = \ - values + values # get the "manualy" declared_fields. Ie: properties declared_fields = form.declared_fields.keys() declared_fields = PropertyModel.objects.filter(available=True).all() - filtered_properties = PropertyModel.objects.filter(available=True, - subcategories__id__isnull=False).all() + filtered_properties = PropertyModel.objects.filter( + available=True, subcategories__id__isnull=False).all() response_dct.update({ - 'actions':actions, - 'action_selected':('contribute', 'edit'), - 'map_layer':settings.CHIMERE_DEFAULT_MAP_LAYER, - 'form':form, - 'formset_multi':formset_multi, - 'formset_picture':formset_picture, - 'dated':settings.CHIMERE_DAYS_BEFORE_EVENT, - 'extra_head':form.media, - 'marker_id':item_id, - 'sub_categories':sub_categories, - 'point_widget':'', - 'properties':declared_fields, - 'filtered_properties':filtered_properties, - 'submited':submited, - 'event':event, + 'actions': actions, + 'action_selected': ('contribute', 'edit'), + 'map_layer': settings.CHIMERE_DEFAULT_MAP_LAYER, + 'form': form, + 'formset_multi': formset_multi, + 'formset_picture': formset_picture, + 'dated': settings.CHIMERE_DAYS_BEFORE_EVENT, + 'extra_head': form.media, + 'marker_id': item_id, + 'sub_categories': sub_categories, + 'point_widget': '', + 'properties': declared_fields, + 'filtered_properties': filtered_properties, + 'submited': submited, + 'event': event, }) # manualy populate the custom widget if 'subcategory' in form.data and form.data['subcategory']: @@ -77,37 +79,38 @@ def edit(request, area_name="", item_id=None, submited=False, event=False): get_edit_route = get_edit_page('edit-route', Route, RouteForm) + 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, ['R', 'B']) + item_id, ['R', 'B']) if response: return response item_id, init_item, response_dct, form, formset_multi, formset_picture = \ - values + values # get the "manualy" declared_fields. Ie: properties declared_fields = form.declared_fields.keys() declared_fields = PropertyModel.objects.filter(available=True).all() - filtered_properties = PropertyModel.objects.filter(available=True, - subcategories__id__isnull=False).all() + filtered_properties = PropertyModel.objects.filter( + available=True, subcategories__id__isnull=False).all() response_dct.update({ - 'actions':actions, - 'action_selected':('contribute', 'edit'), - 'map_layer':settings.CHIMERE_DEFAULT_MAP_LAYER, - 'form':form, - 'formset_multi':formset_multi, - 'formset_picture':formset_picture, - 'dated':settings.CHIMERE_DAYS_BEFORE_EVENT, - 'extra_head':form.media, - 'marker_id':item_id, - 'sub_categories':sub_categories, - 'point_widget':'', - 'properties':declared_fields, - 'filtered_properties':filtered_properties, - 'submited':submited, - 'route':True + 'actions': actions, + 'action_selected': ('contribute', 'edit'), + 'map_layer': settings.CHIMERE_DEFAULT_MAP_LAYER, + 'form': form, + 'formset_multi': formset_multi, + 'formset_picture': formset_picture, + 'dated': settings.CHIMERE_DAYS_BEFORE_EVENT, + 'extra_head': form.media, + 'marker_id': item_id, + 'sub_categories': sub_categories, + 'point_widget': '', + 'properties': declared_fields, + 'filtered_properties': filtered_properties, + 'submited': submited, + 'route': True }) # manualy populate the custom widget if 'subcategory' in form.data and form.data['subcategory']: |