Skip to content

Commit 02e1226

Browse files
committed
Added appropriate Admin classes
- Legacy-Id: 17870
1 parent b7f45db commit 02e1226

4 files changed

Lines changed: 54 additions & 4 deletions

File tree

ietf/doc/admin.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@
1111
StateDocEvent, ConsensusDocEvent, BallotType, BallotDocEvent, WriteupDocEvent, LastCallDocEvent,
1212
TelechatDocEvent, BallotPositionDocEvent, ReviewRequestDocEvent, InitialReviewDocEvent,
1313
AddedMessageEvent, SubmissionDocEvent, DeletedEvent, EditedAuthorsDocEvent, DocumentURL,
14-
ReviewAssignmentDocEvent, IanaExpertDocEvent, IRSGBallotDocEvent )
14+
ReviewAssignmentDocEvent, IanaExpertDocEvent, IRSGBallotDocEvent, DocExtResource )
1515

16+
from ietf.utils.validators import validate_external_resource_value
1617

1718
class StateTypeAdmin(admin.ModelAdmin):
1819
list_display = ["slug", "label"]
@@ -183,3 +184,14 @@ class DocumentUrlAdmin(admin.ModelAdmin):
183184
search_fields = ['doc__name', 'url', ]
184185
raw_id_fields = ['doc', ]
185186
admin.site.register(DocumentURL, DocumentUrlAdmin)
187+
188+
class DocExtResourceAdminForm(forms.ModelForm):
189+
def clean(self):
190+
validate_external_resource_value(self.cleaned_data['name'],self.cleaned_data['value'])
191+
192+
class DocExtResourceAdmin(admin.ModelAdmin):
193+
form = DocExtResourceAdminForm
194+
list_display = ['id', 'doc', 'name', 'display_name', 'value',]
195+
search_fields = ['doc__name', 'value', 'display_name', 'name__slug',]
196+
raw_id_fields = ['doc', ]
197+
admin.site.register(DocExtResource, DocExtResourceAdmin)

ietf/group/admin.py

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
from functools import update_wrapper
66

7+
from django import forms
8+
79
from django.contrib import admin
810
from django.contrib.admin.utils import unquote
911
from django.core.exceptions import PermissionDenied
@@ -16,7 +18,9 @@
1618

1719
from ietf.group.models import (Group, GroupFeatures, GroupHistory, GroupEvent, GroupURL, GroupMilestone,
1820
GroupMilestoneHistory, GroupStateTransitions, Role, RoleHistory, ChangeStateGroupEvent,
19-
MilestoneGroupEvent, )
21+
MilestoneGroupEvent, GroupExtResource, )
22+
23+
from ietf.utils.validators import validate_external_resource_value
2024

2125
class RoleInline(admin.TabularInline):
2226
model = Role
@@ -188,3 +192,14 @@ class MilestoneGroupEventAdmin(admin.ModelAdmin):
188192
list_filter = ['time']
189193
raw_id_fields = ['group', 'by', 'milestone']
190194
admin.site.register(MilestoneGroupEvent, MilestoneGroupEventAdmin)
195+
196+
class GroupExtResourceAdminForm(forms.ModelForm):
197+
def clean(self):
198+
validate_external_resource_value(self.cleaned_data['name'],self.cleaned_data['value'])
199+
200+
class GroupExtResourceAdmin(admin.ModelAdmin):
201+
form = GroupExtResourceAdminForm
202+
list_display = ['id', 'group', 'name', 'display_name', 'value',]
203+
search_fields = ['group__acronym', 'value', 'display_name', 'name__slug',]
204+
raw_id_fields = ['group', ]
205+
admin.site.register(GroupExtResource, GroupExtResourceAdmin)

ietf/name/admin.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
LiaisonStatementState, LiaisonStatementTagName, MeetingTypeName, NomineePositionStateName,
1111
ReviewRequestStateName, ReviewResultName, ReviewTypeName, RoleName, RoomResourceName,
1212
SessionStatusName, StdLevelName, StreamName, TimeSlotTypeName, TopicAudienceName,
13-
DocUrlTagName, ReviewAssignmentStateName, ReviewerQueuePolicyName, TimerangeName)
13+
DocUrlTagName, ReviewAssignmentStateName, ReviewerQueuePolicyName, TimerangeName,
14+
ExtResourceName, ExtResourceTypeName, )
15+
1416

1517
from ietf.stats.models import CountryAlias
1618

@@ -46,6 +48,10 @@ class ImportantDateNameAdmin(NameAdmin):
4648
ordering = ('-used','default_offset_days',)
4749
admin.site.register(ImportantDateName,ImportantDateNameAdmin)
4850

51+
class ExtResourceNameAdmin(NameAdmin):
52+
list_display = ["slug", "name", "type", "desc", "used",]
53+
admin.site.register(ExtResourceName,ExtResourceNameAdmin)
54+
4955
admin.site.register(AgendaTypeName, NameAdmin)
5056
admin.site.register(BallotPositionName, NameAdmin)
5157
admin.site.register(ConstraintName, NameAdmin)
@@ -82,3 +88,4 @@ class ImportantDateNameAdmin(NameAdmin):
8288
admin.site.register(TimerangeName, NameAdmin)
8389
admin.site.register(TopicAudienceName, NameAdmin)
8490
admin.site.register(DocUrlTagName, NameAdmin)
91+
admin.site.register(ExtResourceTypeName, NameAdmin)

ietf/person/admin.py

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
from django.contrib import admin
22
import simple_history
33

4-
from ietf.person.models import Email, Alias, Person, PersonalApiKey, PersonEvent, PersonApiKeyEvent
4+
from django import forms
5+
6+
from ietf.person.models import Email, Alias, Person, PersonalApiKey, PersonEvent, PersonApiKeyEvent, PersonExtResource
57
from ietf.person.name import name_parts
68

9+
from ietf.utils.validators import validate_external_resource_value
10+
11+
712
class EmailAdmin(simple_history.admin.SimpleHistoryAdmin):
813
list_display = ["address", "person", "time", "active", "origin"]
914
raw_id_fields = ["person", ]
@@ -55,3 +60,14 @@ class PersonApiKeyEventAdmin(admin.ModelAdmin):
5560
admin.site.register(PersonApiKeyEvent, PersonApiKeyEventAdmin)
5661

5762

63+
64+
class PersonExtResourceAdminForm(forms.ModelForm):
65+
def clean(self):
66+
validate_external_resource_value(self.cleaned_data['name'],self.cleaned_data['value'])
67+
68+
class PersonExtResourceAdmin(admin.ModelAdmin):
69+
form = PersonExtResourceAdminForm
70+
list_display = ['id', 'person', 'name', 'display_name', 'value',]
71+
search_fields = ['person__name', 'value', 'display_name', 'name__slug',]
72+
raw_id_fields = ['person', ]
73+
admin.site.register(PersonExtResource, PersonExtResourceAdmin)

0 commit comments

Comments
 (0)