altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity

Avoid duplicate choices for person api endpoints.

Browse source 
- Legacy-Id: 19082
This commit is contained in:
Robert Sparks 2021-06-04 21:45:16 +00:00
parent 3571a4cd86
commit 80798f8dfa
3 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/ietfauth/views.py
View file

@ -728,7 +728,7 @@ def apikey_index(request):
@login_required
@person_required
def apikey_create(request):
endpoints = [('', '----------')] + [ (v, n) for (v, n, r) in PERSON_API_KEY_VALUES if r==None or has_role(request.user, r) ]
endpoints = [('', '----------')] + list(set([ (v, n) for (v, n, r) in PERSON_API_KEY_VALUES if r==None or has_role(request.user, r) ]))
class ApiKeyForm(forms.ModelForm):
endpoint = forms.ChoiceField(choices=endpoints)

18
ietf/person/migrations/0019_auto_20210604_1443.py Normal file
View file

@ -0,0 +1,18 @@
# Generated by Django 2.2.20 on 2021-06-04 14:43
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('person', '0018_auto_20201109_0439'),
]
operations = [
migrations.AlterField(
model_name='personalapikey',
name='endpoint',
field=models.CharField(choices=[('/api/iesg/position', '/api/iesg/position'), ('/api/meeting/session/video/url', '/api/meeting/session/video/url'), ('/api/notify/meeting/bluesheet', '/api/notify/meeting/bluesheet'), ('/api/notify/meeting/registration', '/api/notify/meeting/registration'), ('/api/v2/person/person', '/api/v2/person/person')], max_length=128),
),
]

4
ietf/person/models.py
View file

@ -242,7 +242,7 @@ class Person(models.Model):
def available_api_endpoints(self):
from ietf.ietfauth.utils import has_role
return [ (v, n) for (v, n, r) in PERSON_API_KEY_VALUES if r==None or has_role(self.user, r) ]
return list(set([ (v, n) for (v, n, r) in PERSON_API_KEY_VALUES if r==None or has_role(self.user, r) ]))
class PersonExtResource(models.Model):
@ -354,7 +354,7 @@ PERSON_API_KEY_VALUES = [
("/api/notify/meeting/registration", "/api/notify/meeting/registration", "Robot"),
("/api/notify/meeting/bluesheet", "/api/notify/meeting/bluesheet", "Recording Manager"),
]
PERSON_API_KEY_ENDPOINTS = [ (v, n) for (v, n, r) in PERSON_API_KEY_VALUES ]
PERSON_API_KEY_ENDPOINTS = sorted(list(set([ (v, n) for (v, n, r) in PERSON_API_KEY_VALUES ])))
class PersonalApiKey(models.Model):
person = ForeignKey(Person, related_name='apikeys')