Skip to content

Commit 0a62744

Browse files
committed
Fixed error in public nomination process
Refactor view permissions. See ietf-tools#913 ietf-tools#919 - Legacy-Id: 5181
1 parent de7bab7 commit 0a62744

2 files changed

Lines changed: 4 additions & 9 deletions

File tree

ietf/nomcom/utils.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ def get_nomcom_by_year(year):
2323

2424
def get_user_email(user):
2525
emails = Email.objects.filter(person__user=user)
26+
email = emails and emails[0] or None
27+
return email
2628

2729

2830
def is_nomcom_member(user, nomcom):

ietf/nomcom/views.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
# -*- coding: utf-8 -*-
22
from django.shortcuts import render_to_response
33
from django.template import RequestContext
4-
from django.http import HttpResponseForbidden, HttpResponse
4+
from django.http import HttpResponse
55
from django.contrib.auth.decorators import login_required
66
from django.template.loader import render_to_string
77
from django.utils import simplejson
88

9-
from ietf.nomcom.utils import get_nomcom_by_year, is_nomcom_member, \
10-
is_nomcom_chair, HOME_TEMPLATE
9+
from ietf.nomcom.utils import get_nomcom_by_year, HOME_TEMPLATE
1110
from ietf.nomcom.decorators import member_required
1211
from ietf.nomcom.forms import EditPublicKeyForm, NominateForm
1312
from ietf.nomcom.models import Position
@@ -27,7 +26,6 @@ def index(request, year):
2726
@member_required(role='member')
2827
def private_index(request, year):
2928
nomcom = get_nomcom_by_year(year)
30-
is_nomcom_member(request.user, nomcom)
3129
return render_to_response('nomcom/private_index.html',
3230
{'nomcom': nomcom,
3331
'year': year,
@@ -38,7 +36,6 @@ def private_index(request, year):
3836
def private_merge(request, year):
3937
# TODO: complete merge nominations
4038
nomcom = get_nomcom_by_year(year)
41-
is_nomcom_member(request.user, nomcom)
4239
return render_to_response('nomcom/private_merge.html',
4340
{'nomcom': nomcom,
4441
'year': year,
@@ -123,10 +120,6 @@ def comments(request, year):
123120
@member_required(role='chair')
124121
def edit_publickey(request, year):
125122
nomcom = get_nomcom_by_year(year)
126-
is_nomcom_chair(request.user, nomcom)
127-
is_group_chair = nomcom.group.is_chair(request.user)
128-
if not is_group_chair:
129-
return HttpResponseForbidden("Must be group chair")
130123

131124
message = ('warning', 'Previous data will remain encrypted with the old key')
132125
if request.method == 'POST':

0 commit comments

Comments
 (0)