diff --git a/ietf/meeting/ajax.py b/ietf/meeting/ajax.py index b824c4ae1..d11b17c41 100644 --- a/ietf/meeting/ajax.py +++ b/ietf/meeting/ajax.py @@ -2,7 +2,7 @@ import json from django.core.urlresolvers import reverse from django.shortcuts import get_object_or_404, redirect -from django.http import HttpResponseRedirect, HttpResponse, QueryDict +from django.http import HttpResponseRedirect, HttpResponse from dajaxice.decorators import dajaxice_register from ietf.ietfauth.utils import role_required, has_role, user_is_person @@ -208,7 +208,7 @@ def timeslot_roomurl(request, num=None, roomid=None): return HttpResponse(json.dumps(room.json_dict(request.build_absolute_uri('/'))), content_type="application/json") # XXX FIXME: timeslot_updroom() doesn't exist -# elif request.method == 'PUT': +# elif request.method == 'POST': # return timeslot_updroom(request, meeting) elif request.method == 'DELETE': return timeslot_delroom(request, meeting, roomid) @@ -275,7 +275,7 @@ def timeslot_sloturl(request, num=None, slotid=None): slot = get_object_or_404(meeting.timeslot_set, pk=slotid) return HttpResponse(json.dumps(slot.json_dict(request.build_absolute_uri('/'))), content_type="application/json") - elif request.method == 'PUT': + elif request.method == 'POST': # not yet implemented! #return timeslot_updslot(request, meeting) return HttpResponse(status=406) @@ -317,8 +317,8 @@ def agenda_add(request, meeting): @role_required('Area Director','Secretariat') def agenda_update(request, meeting, schedule): # forms are completely useless for update actions that want to - # accept a subset of values. - update_dict = QueryDict(request.body, encoding=request._encoding) + # accept a subset of values. (huh? just use required=False) + update_dict = request.POST #debug.log("99 meeting.agenda: %s / %s / %s" % # (schedule, update_dict, request.body)) @@ -390,7 +390,7 @@ def agenda_infourl(request, num=None, schedule_name=None): if request.method == 'GET': return HttpResponse(json.dumps(schedule.json_dict(request.build_absolute_uri('/'))), content_type="application/json") - elif request.method == 'PUT': + elif request.method == 'POST': return agenda_update(request, meeting, schedule) elif request.method == 'DELETE': return agenda_del(request, meeting, schedule) @@ -409,7 +409,7 @@ def meeting_get(request, meeting): @role_required('Secretariat') def meeting_update(request, meeting): # at present, only the official agenda can be updated from this interface. - update_dict = QueryDict(request.body, encoding=request._encoding) + update_dict = request.POST #debug.log("1 meeting.agenda: %s / %s / %s" % (meeting.agenda, update_dict, request.body)) if "agenda" in update_dict: @@ -433,7 +433,7 @@ def meeting_json(request, num): if request.method == 'GET': return meeting_get(request, meeting) - elif request.method == 'PUT': + elif request.method == 'POST': return meeting_update(request, meeting) elif request.method == 'POST': return meeting_update(request, meeting) diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index b7658e8b0..e8e2bf2e1 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -282,7 +282,7 @@ def edit_agenda(request, num=None, schedule_name=None): ############################################################################## # show the properties associated with an agenda (visible, public) -# this page uses ajax PUT requests to the API +# this page uses ajax POST requests to the API # AgendaPropertiesForm = modelform_factory(Schedule, fields=('name','visible', 'public')) diff --git a/ietf/templates/meeting/properties_edit.html b/ietf/templates/meeting/properties_edit.html index 74c665e42..802d91731 100644 --- a/ietf/templates/meeting/properties_edit.html +++ b/ietf/templates/meeting/properties_edit.html @@ -52,7 +52,7 @@ -
+
{{ form.as_table }} diff --git a/static/js/agenda/agenda_properties_edit.js b/static/js/agenda/agenda_properties_edit.js index 63f7b9d69..6ecb4a04f 100644 --- a/static/js/agenda/agenda_properties_edit.js +++ b/static/js/agenda/agenda_properties_edit.js @@ -52,21 +52,21 @@ function toggle_public(event) { var agenda_url = $(event.target).closest('tr').attr('href'); var new_value = 1; - log("value "+current_value) + log("value "+current_value); if(current_value == "public") { - new_value = 0 + new_value = 0; } event.preventDefault(); $.ajax({ "url": agenda_url, - "type": "PUT", + "type": "POST", "data": { "public" : new_value }, "dataType": "json", "success": function(result) { /* result is a json object */ - value = result["public"] - log("new value "+value) - $(span_to_replace).html(value) + value = result["public"]; + log("new value "+value); + $(span_to_replace).html(value); }}); } @@ -76,14 +76,14 @@ function toggle_visible(event) { var agenda_url = $(event.target).closest('tr').attr('href'); var new_value = 1; - log("value "+current_value) + log("value "+current_value); if(current_value == "visible") { - new_value = 0 + new_value = 0; } event.preventDefault(); $.ajax({ "url": agenda_url, - "type": "PUT", + "type": "POST", "data": { "visible" : new_value }, "dataType": "json", "success": function(result) { @@ -131,7 +131,7 @@ function toggle_official(event) { //log("clicked on "+agenda_url+" sending to "+meeting_url); $.ajax({ "url": meeting_url, - "type": "PUT", + "type": "POST", "data": { "agenda" : new_value }, "dataType": "json", "success": function(result) { @@ -151,12 +151,12 @@ function save_agenda(form) { public_flag = form.elements["public"].checked ? true : false; visible_flag = form.elements["visible"].checked ? true: false; - console.log("PUT to ",agenda_url," with name:", name_str, + console.log("POST to ",agenda_url," with name:", name_str, "visible:", visible_flag, "public:", public_flag); $.ajax({"url": agenda_url, - "type": "PUT", + "type": "POST", "data": { "public" : public_flag, "visible": visible_flag, "name" : name_str, diff --git a/static/js/agenda/agenda_property_utils.js b/static/js/agenda/agenda_property_utils.js index 632ad736a..4490737c4 100644 --- a/static/js/agenda/agenda_property_utils.js +++ b/static/js/agenda/agenda_property_utils.js @@ -58,7 +58,7 @@ function toggle_public(event) { event.preventDefault(); $.ajax({ "url": agenda_url, - "type": "PUT", + "type": "POST", "data": { "public" : new_value }, "dataType": "json", "success": function(result) { @@ -82,7 +82,7 @@ function toggle_visible(event) { event.preventDefault(); $.ajax({ "url": agenda_url, - "type": "PUT", + "type": "POST", "data": { "visible" : new_value }, "dataType": "json", "success": function(result) { diff --git a/static/js/agenda/agendas_edit.js b/static/js/agenda/agendas_edit.js index c7984ff1e..03b7e4f28 100644 --- a/static/js/agenda/agendas_edit.js +++ b/static/js/agenda/agendas_edit.js @@ -94,7 +94,7 @@ function toggle_official(event) { log("clicked on "+agenda_url+" sending to "+meeting_url); $.ajax({ "url": meeting_url, - "type": "PUT", + "type": "POST", "data": { "agenda" : new_value }, "dataType": "json", "success": function(result) {