Skip to content

Commit dbf5e6a

Browse files
OleLaursenOleLaursen
committed
Remove a bunch of old admin files, fix a couple of issues with the new ones, add admin for meeting
 - Legacy-Id: 3995
1 parent 65d3b28 commit dbf5e6a

File tree

16 files changed

+97
-530
lines changed

16 files changed

+97
-530
lines changed

‎ietf/announcements/admin.py‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎ietf/group/admin.py‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@
1111
from django.utils.html import escape
1212
from django.utils.translation import ugettext as _
1313

14-
from models import *
14+
from ietf.group.models import *
15+
16+
class RoleInline(admin.TabularInline):
17+
model = Role
18+
raw_id_fields = ["person", "email"]
1519

1620
class GroupAdmin(admin.ModelAdmin):
1721
list_display = ["acronym", "name", "type", "role_list"]
@@ -20,6 +24,7 @@ class GroupAdmin(admin.ModelAdmin):
2024
search_fields = ["acronym", "name"]
2125
ordering = ["name"]
2226
raw_id_fields = ["charter", "parent", "ad"]
27+
inlines = [RoleInline]
2328

2429
def role_list(self, obj):
2530
roles = Role.objects.filter(group=obj).order_by("name", "person__name").select_related('person')
@@ -97,6 +102,12 @@ def send_one_reminder(self, request, object_id):
97102
admin.site.register(Group, GroupAdmin)
98103
admin.site.register(GroupHistory)
99104
admin.site.register(GroupURL)
105+
class GroupMilestoneAdmin(admin.ModelAdmin):
106+
list_display = ["group", "desc", "expected_due_date", "time"]
107+
search_fields = ["group__name", "group__acronym", "desc"]
108+
raw_id_fields = ["group"]
109+
110+
admin.site.register(GroupMilestone, GroupMilestoneAdmin)
100111

101112
class RoleAdmin(admin.ModelAdmin):
102113
list_display = ["name", "person", "email", "group"]

‎ietf/group/models.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def __unicode__(self):
6262

6363
class GroupMilestone(models.Model):
6464
group = models.ForeignKey(Group)
65-
desc = models.TextField()
65+
desc = models.TextField(verbose_name="Description")
6666
expected_due_date = models.DateField()
6767
done = models.BooleanField()
6868
done_date = models.DateField(null=True, blank=True)

‎ietf/idrfc/admin.py‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎ietf/idtracker/admin.py‎

Lines changed: 0 additions & 161 deletions
This file was deleted.

‎ietf/iesg/admin.py‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
1-
#coding: utf-8
21
from django.contrib import admin
32
from ietf.iesg.models import *
43

54
class TelechatAgendaItemAdmin(admin.ModelAdmin):
65
pass
76
admin.site.register(TelechatAgendaItem, TelechatAgendaItemAdmin)
87

9-
if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
10-
class TelechatDatesAdmin(admin.ModelAdmin):
11-
pass
12-
admin.site.register(TelechatDates, TelechatDatesAdmin)
13-
148
class WGActionAdmin(admin.ModelAdmin):
159
pass
1610
admin.site.register(WGAction, WGActionAdmin)

‎ietf/ietfworkflows/admin.py‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎ietf/ipr/admin.py‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,8 @@ class IprContactAdmin(admin.ModelAdmin):
1010
class IprDetailAdmin(admin.ModelAdmin):
1111
list_display = ['title', 'submitted_date', 'docs', ]
1212
search_fields = ['title', 'legal_name', ]
13-
pass
1413
admin.site.register(IprDetail, IprDetailAdmin)
1514

16-
class IprDraftAdmin(admin.ModelAdmin):
17-
pass
18-
if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
19-
admin.site.register(IprDraft, IprDraftAdmin)
20-
2115
class IprLicensingAdmin(admin.ModelAdmin):
2216
pass
2317
admin.site.register(IprLicensing, IprLicensingAdmin)
@@ -26,11 +20,6 @@ class IprNotificationAdmin(admin.ModelAdmin):
2620
pass
2721
admin.site.register(IprNotification, IprNotificationAdmin)
2822

29-
class IprRfcAdmin(admin.ModelAdmin):
30-
pass
31-
if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
32-
admin.site.register(IprRfc, IprRfcAdmin)
33-
3423
class IprSelecttypeAdmin(admin.ModelAdmin):
3524
pass
3625
admin.site.register(IprSelecttype, IprSelecttypeAdmin)
@@ -39,3 +28,4 @@ class IprUpdateAdmin(admin.ModelAdmin):
3928
pass
4029
admin.site.register(IprUpdate, IprUpdateAdmin)
4130

31+
admin.site.register(IprDocAlias)

‎ietf/ipr/models.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,10 @@ def __unicode__(self):
219219
else:
220220
return u"%s which applies to %s" % (self.ipr, self.doc_alias.name)
221221

222+
class Meta:
223+
verbose_name = "IPR document alias"
224+
verbose_name_plural = "IPR document aliases"
225+
222226
# proxy stuff
223227
IprDraftOld = IprDraft
224228
IprRfcOld = IprRfc

0 commit comments

Comments
 (0)