diff options
Diffstat (limited to 'chimere/views.py')
| -rw-r--r-- | chimere/views.py | 37 |
1 files changed, 10 insertions, 27 deletions
diff --git a/chimere/views.py b/chimere/views.py index 7c983a3..fdc4da0 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -294,6 +294,9 @@ def edit(request, area_name="", item_id=None, submited=False): declared_fields = PropertyModel.objects.filter(available=True).all() filtered_properties = PropertyModel.objects.filter(available=True, subcategories__id__isnull=False).all() + point_value = init_item.point if init_item else None + if request.POST and request.POST.get('point'): + point_value = request.POST.get('point') response_dct.update({ 'actions':actions(response_dct['area_name']), 'action_selected':('contribute', 'edit'), @@ -306,7 +309,7 @@ def edit(request, area_name="", item_id=None, submited=False): 'marker_id':item_id, 'sub_categories':sub_categories, 'point_widget':PointChooserWidget().render('point', - init_item.point if init_item else None, + point_value, area_name=response_dct['area_name']), 'properties':declared_fields, 'filtered_properties':filtered_properties, @@ -377,8 +380,8 @@ def processRouteFile(request, area_name='', file_id=None): return HttpResponse('('+simplejson.dumps({'wkt':route, 'file_id':file_id})+')', 'application/javascript', status=200) - except: - return HttpResponse(status=500) + except OSError as e: + return HttpResponse(e.strerror, status=500) else: return HttpResponse(status=400) @@ -399,6 +402,9 @@ def editRoute(request, area_name="", item_id=None, submited=False): declared_fields = form.declared_fields.keys() if 'description' in declared_fields: declared_fields.pop(declared_fields.index('description')) + route_value = init_item.route if init_item else None + if request.POST and request.POST.get('route'): + route_value = request.POST.get('route') response_dct.update({ 'actions':actions(response_dct['area_name']), 'action_selected':('contribute', 'edit-route'), @@ -410,8 +416,7 @@ def editRoute(request, area_name="", item_id=None, submited=False): 'dated':settings.CHIMERE_DAYS_BEFORE_EVENT, 'extra_head':form.media, 'sub_categories':sub_categories, - 'route_widget':RouteChooserWidget().render('route', - init_item.route if init_item else None, + 'route_widget':RouteChooserWidget().render('route', route_value, area_name=response_dct['area_name'], routefile_id='',), 'properties':declared_fields, 'submited':submited @@ -422,28 +427,6 @@ def editRoute(request, area_name="", item_id=None, submited=False): return render_to_response('chimere/edit_route.html', response_dct, context_instance=RequestContext(request)) -def welcome(request, display=None): - """ - Welcome string - """ - response_dct = {'display':display} - news = list(News.objects.filter(available=True, is_front_page=True).all()) - if settings.CHIMERE_DAYS_BEFORE_EVENT: - q = checkDate(Q(status='A', start_date__isnull=False, - is_front_page=True)) - news += list(Marker.objects.filter(q).all()) - news.sort(key=lambda x:x.date, reverse=True)[:3] - response_dct['news_lst'] = news - if "area_name" in context: - try: - area = Area.objects.get(urn=context["area_name"]) - context_data['area_name'] = context['area_name'] - context_data['welcome_message'] = area.welcome_message - except ObjectDoesNotExist: - pass - return loader.render_to_string('chimere/blocks/welcome.html', response_dct, - context_instance=RequestContext(request)) - def submited(request, area_name="", action=""): """ Successful submission page |