Skip to content

Commit 3408b73

Browse files
committed
Use request.POST directly instead of aliasing it to update_dict, add a
FIXME on permission naming - Legacy-Id: 7068
1 parent f8b1568 commit 3408b73

1 file changed

Lines changed: 13 additions & 15 deletions

File tree

ietf/meeting/ajax.py

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ def readonly(request, meeting_num, schedule_id):
4242
if user_is_person(user, schedule.owner):
4343
read_only = False
4444

45+
# FIXME: the naming here needs improvement, one can have
46+
# read_only == True and write_perm == True?
47+
4548
return json.dumps(
4649
{'secretariat': secretariat,
4750
'write_perm': write_perm,
@@ -317,32 +320,31 @@ def agenda_add(request, meeting):
317320
@role_required('Area Director','Secretariat')
318321
def agenda_update(request, meeting, schedule):
319322
# forms are completely useless for update actions that want to
320-
# accept a subset of values. (huh? just use required=False)
321-
update_dict = request.POST
323+
# accept a subset of values. (huh? we could use required=False)
322324

323325
#debug.log("99 meeting.agenda: %s / %s / %s" %
324326
# (schedule, update_dict, request.body))
325327

326328
user = request.user
327329
if has_role(user, "Secretariat"):
328-
if "public" in update_dict:
330+
if "public" in request.POST:
329331
value1 = True
330-
value = update_dict["public"]
332+
value = request.POST["public"]
331333
if value == "0" or value == 0 or value=="false":
332334
value1 = False
333335
#debug.log("setting public for %s to %s" % (schedule, value1))
334336
schedule.public = value1
335337

336-
if "visible" in update_dict:
338+
if "visible" in request.POST:
337339
value1 = True
338-
value = update_dict["visible"]
340+
value = request.POST["visible"]
339341
if value == "0" or value == 0 or value=="false":
340342
value1 = False
341343
#debug.log("setting visible for %s to %s" % (schedule, value1))
342344
schedule.visible = value1
343345

344-
if "name" in update_dict:
345-
value = update_dict["name"]
346+
if "name" in request.POST:
347+
value = request.POST["name"]
346348
#debug.log("setting name for %s to %s" % (schedule, value))
347349
schedule.name = value
348350

@@ -409,13 +411,12 @@ def meeting_get(request, meeting):
409411
@role_required('Secretariat')
410412
def meeting_update(request, meeting):
411413
# at present, only the official agenda can be updated from this interface.
412-
update_dict = request.POST
413414

414415
#debug.log("1 meeting.agenda: %s / %s / %s" % (meeting.agenda, update_dict, request.body))
415-
if "agenda" in update_dict:
416-
value = update_dict["agenda"]
416+
if "agenda" in request.POST:
417+
value = request.POST["agenda"]
417418
#debug.log("4 meeting.agenda: %s" % (value))
418-
if value is None or value == "None":
419+
if not value or value == "None": # value == "None" is just weird, better with empty string
419420
meeting.agenda = None
420421
else:
421422
schedule = get_schedule(meeting, value)
@@ -435,9 +436,6 @@ def meeting_json(request, num):
435436
return meeting_get(request, meeting)
436437
elif request.method == 'POST':
437438
return meeting_update(request, meeting)
438-
elif request.method == 'POST':
439-
return meeting_update(request, meeting)
440-
441439
else:
442440
return HttpResponse(status=406)
443441

0 commit comments

Comments
 (0)