Remove a bunch of old admin files, fix a couple of issues with the new ones, add admin for meeting
- Legacy-Id: 3995
This commit is contained in:
Ole Laursen
parent
65d3b28707
commit
dbf5e6ab84
|
|
@ -1,22 +0,0 @@
|
|||
#coding: utf-8
|
||||
from django.contrib import admin
|
||||
from ietf.announcements.models import *
|
||||
|
||||
class AnnouncedFromAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
admin.site.register(AnnouncedFrom, AnnouncedFromAdmin)
|
||||
|
||||
class AnnouncedToAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
admin.site.register(AnnouncedTo, AnnouncedToAdmin)
|
||||
|
||||
class AnnouncementAdmin(admin.ModelAdmin):
|
||||
list_display=('announced_from', 'announced_to', 'announced_date', 'subject')
|
||||
date_hierarchy='announced_date'
|
||||
list_filter=['nomcom', 'manually_added']
|
||||
raw_id_fields=['announced_by']
|
||||
admin.site.register(Announcement, AnnouncementAdmin)
|
||||
|
||||
class ScheduledAnnouncementAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
admin.site.register(ScheduledAnnouncement, ScheduledAnnouncementAdmin)
|
||||
|
|
@ -11,7 +11,11 @@ from django.utils.functional import update_wrapper
|
|||
from django.utils.html import escape
|
||||
from django.utils.translation import ugettext as _
|
||||
|
||||
from models import *
|
||||
from ietf.group.models import *
|
||||
|
||||
class RoleInline(admin.TabularInline):
|
||||
model = Role
|
||||
raw_id_fields = ["person", "email"]
|
||||
|
||||
class GroupAdmin(admin.ModelAdmin):
|
||||
list_display = ["acronym", "name", "type", "role_list"]
|
||||
|
|
@ -20,6 +24,7 @@ class GroupAdmin(admin.ModelAdmin):
|
|||
search_fields = ["acronym", "name"]
|
||||
ordering = ["name"]
|
||||
raw_id_fields = ["charter", "parent", "ad"]
|
||||
inlines = [RoleInline]
|
||||
|
||||
def role_list(self, obj):
|
||||
roles = Role.objects.filter(group=obj).order_by("name", "person__name").select_related('person')
|
||||
|
|
@ -97,6 +102,12 @@ class GroupAdmin(admin.ModelAdmin):
|
|||
admin.site.register(Group, GroupAdmin)
|
||||
admin.site.register(GroupHistory)
|
||||
admin.site.register(GroupURL)
|
||||
class GroupMilestoneAdmin(admin.ModelAdmin):
|
||||
list_display = ["group", "desc", "expected_due_date", "time"]
|
||||
search_fields = ["group__name", "group__acronym", "desc"]
|
||||
raw_id_fields = ["group"]
|
||||
|
||||
admin.site.register(GroupMilestone, GroupMilestoneAdmin)
|
||||
|
||||
class RoleAdmin(admin.ModelAdmin):
|
||||
list_display = ["name", "person", "email", "group"]
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ class GroupURL(models.Model):
|
|||
|
||||
class GroupMilestone(models.Model):
|
||||
group = models.ForeignKey(Group)
|
||||
desc = models.TextField()
|
||||
desc = models.TextField(verbose_name="Description")
|
||||
expected_due_date = models.DateField()
|
||||
done = models.BooleanField()
|
||||
done_date = models.DateField(null=True, blank=True)
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
#coding: utf-8
|
||||
from django.contrib import admin
|
||||
from ietf.idrfc.models import *
|
||||
|
||||
class DraftVersionsAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
admin.site.register(DraftVersions, DraftVersionsAdmin)
|
||||
|
||||
class RfcEditorQueueAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
admin.site.register(RfcEditorQueue, RfcEditorQueueAdmin)
|
||||
|
||||
class RfcEditorQueueRefAdmin(admin.ModelAdmin):
|
||||
list_display = ["id", "source", "destination", "in_queue", "direct"]
|
||||
pass
|
||||
admin.site.register(RfcEditorQueueRef, RfcEditorQueueRefAdmin)
|
||||
|
||||
class RfcIndexAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
admin.site.register(RfcIndex, RfcIndexAdmin)
|
||||
|
||||
|
|
@ -1,161 +0,0 @@
|
|||
#coding: utf-8
|
||||
from django.contrib import admin
|
||||
from django.conf import settings
|
||||
from ietf.idtracker.models import *
|
||||
|
||||
if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
|
||||
class AcronymAdmin(admin.ModelAdmin):
|
||||
list_display=('acronym', 'name')
|
||||
admin.site.register(Acronym, AcronymAdmin)
|
||||
|
||||
class AreaAdmin(admin.ModelAdmin):
|
||||
list_display=('area_acronym', 'status')
|
||||
admin.site.register(Area, AreaAdmin)
|
||||
|
||||
class AreaDirectorAdmin(admin.ModelAdmin):
|
||||
raw_id_fields=['person']
|
||||
admin.site.register(AreaDirector, AreaDirectorAdmin)
|
||||
|
||||
class AreaStatusAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
admin.site.register(AreaStatus, AreaStatusAdmin)
|
||||
|
||||
class AreaWGURLAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
admin.site.register(AreaWGURL, AreaWGURLAdmin)
|
||||
|
||||
if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
|
||||
class BallotInfoAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
admin.site.register(BallotInfo, BallotInfoAdmin)
|
||||
|
||||
class ChairsHistoryAdmin(admin.ModelAdmin):
|
||||
list_display=('person', 'chair_type', 'start_year', 'end_year')
|
||||
admin.site.register(ChairsHistory, ChairsHistoryAdmin)
|
||||
|
||||
class DocumentCommentAdmin(admin.ModelAdmin):
|
||||
ordering=['-date']
|
||||
list_display=('doc_name', 'doc_id', 'date', 'time', 'comment_text')
|
||||
search_fields = ['document__draft__filename', ]
|
||||
admin.site.register(DocumentComment, DocumentCommentAdmin)
|
||||
|
||||
class EmailAddressAdmin(admin.ModelAdmin):
|
||||
list_display=('id', 'person_link', 'address', 'type', 'priority_link')
|
||||
search_fields=['address']
|
||||
raw_id_fields=['person_or_org', ]
|
||||
admin.site.register(EmailAddress, EmailAddressAdmin)
|
||||
|
||||
class GoalMilestoneAdmin(admin.ModelAdmin):
|
||||
list_display=('group_acronym', 'description', 'expected_due_date', 'done')
|
||||
date_hierarchy='expected_due_date'
|
||||
list_filter=['done']
|
||||
admin.site.register(GoalMilestone, GoalMilestoneAdmin)
|
||||
|
||||
class IDIntendedStatusAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
admin.site.register(IDIntendedStatus, IDIntendedStatusAdmin)
|
||||
|
||||
if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
|
||||
class IDInternalAdmin(admin.ModelAdmin):
|
||||
ordering=['draft']
|
||||
list_display=['pk', 'rfc_flag', 'token_email', 'note', 'tracker_link', 'draft_link']
|
||||
search_fields=['draft__filename']
|
||||
raw_id_fields=['draft','ballot']
|
||||
admin.site.register(IDInternal, IDInternalAdmin)
|
||||
|
||||
class IDNextStateAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
admin.site.register(IDNextState, IDNextStateAdmin)
|
||||
|
||||
class IDStateAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
admin.site.register(IDState, IDStateAdmin)
|
||||
|
||||
class IDStatusAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
admin.site.register(IDStatus, IDStatusAdmin)
|
||||
|
||||
class IDSubStateAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
admin.site.register(IDSubState, IDSubStateAdmin)
|
||||
|
||||
class IESGCommentAdmin(admin.ModelAdmin):
|
||||
raw_id_fields = ['ballot','ad']
|
||||
admin.site.register(IESGComment, IESGCommentAdmin)
|
||||
|
||||
class IESGDiscussAdmin(admin.ModelAdmin):
|
||||
raw_id_fields = ['ballot','ad']
|
||||
admin.site.register(IESGDiscuss, IESGDiscussAdmin)
|
||||
|
||||
class IESGLoginAdmin(admin.ModelAdmin):
|
||||
ordering=['user_level', 'last_name']
|
||||
list_display=('login_name', 'first_name', 'last_name', 'user_level')
|
||||
raw_id_fields=['person']
|
||||
if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
|
||||
admin.site.register(IESGLogin, IESGLoginAdmin)
|
||||
|
||||
class IETFWGAdmin(admin.ModelAdmin):
|
||||
list_display=('group_acronym', 'group_type', 'status', 'area_acronym', 'start_date', 'concluded_date', 'chairs_link')
|
||||
search_fields=['group_acronym__acronym', 'group_acronym__name']
|
||||
list_filter=['status', 'group_type']
|
||||
if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
|
||||
admin.site.register(IETFWG, IETFWGAdmin)
|
||||
|
||||
class WGChairAdmin(admin.ModelAdmin):
|
||||
list_display = ('person_link', 'group_link')
|
||||
admin.site.register(WGChair, WGChairAdmin)
|
||||
|
||||
class IRTFAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
admin.site.register(IRTF, IRTFAdmin)
|
||||
|
||||
if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
|
||||
class InternetDraftAdmin(admin.ModelAdmin):
|
||||
list_display=('filename', 'revision', 'title', 'status')
|
||||
search_fields=['filename', 'title']
|
||||
list_filter=['status']
|
||||
raw_id_fields=['replaced_by']
|
||||
admin.site.register(InternetDraft, InternetDraftAdmin)
|
||||
|
||||
class PersonOrOrgInfoAdmin(admin.ModelAdmin):
|
||||
list_display = ['person_or_org_tag', 'last_name', 'first_name', ]
|
||||
fieldsets=((None, {'fields': (('first_name', 'middle_initial', 'last_name'), ('name_suffix', 'modified_by'))}), ('Obsolete Info', {'fields': ('record_type', 'created_by', 'address_type'), 'classes': 'collapse'}))
|
||||
search_fields=['first_name', 'last_name']
|
||||
admin.site.register(PersonOrOrgInfo, PersonOrOrgInfoAdmin)
|
||||
|
||||
class PositionAdmin(admin.ModelAdmin):
|
||||
raw_id_fields=['ballot','ad']
|
||||
admin.site.register(Position, PositionAdmin)
|
||||
|
||||
class RfcAdmin(admin.ModelAdmin):
|
||||
fieldsets=((None, {'fields': ('rfc_number', 'title', 'group_acronym', 'area_acronym', 'status', 'comments', 'last_modified_date')}), ('Metadata', {'fields': (('online_version', 'txt_page_count'), ('fyi_number', 'std_number')), 'classes': 'collapse'}), ('Standards Track Dates', {'fields': ('rfc_published_date', ('proposed_date', 'draft_date'), ('standard_date', 'historic_date')), 'classes': 'collapse'}), ('Last Call / Ballot Info', {'fields': ('intended_status', ('lc_sent_date', 'lc_expiration_date'), ('b_sent_date', 'b_approve_date')), 'classes': 'collapse'}))
|
||||
list_display=['rfc_number', 'title']
|
||||
search_fields=['title']
|
||||
if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
|
||||
admin.site.register(Rfc, RfcAdmin)
|
||||
|
||||
class RfcIntendedStatusAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
admin.site.register(RfcIntendedStatus, RfcIntendedStatusAdmin)
|
||||
|
||||
class RfcObsoleteAdmin(admin.ModelAdmin):
|
||||
raw_id_fields=['rfc','rfc_acted_on']
|
||||
admin.site.register(RfcObsolete, RfcObsoleteAdmin)
|
||||
|
||||
class RfcStatusAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
admin.site.register(RfcStatus, RfcStatusAdmin)
|
||||
|
||||
class RoleAdmin(admin.ModelAdmin):
|
||||
list_display = ["person", "role_name", ]
|
||||
raw_id_fields = ["person", ]
|
||||
admin.site.register(Role, RoleAdmin)
|
||||
|
||||
class WGStatusAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
admin.site.register(WGStatus, WGStatusAdmin)
|
||||
|
||||
class WGTypeAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
admin.site.register(WGType, WGTypeAdmin)
|
||||
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
#coding: utf-8
|
||||
from django.contrib import admin
|
||||
from ietf.iesg.models import *
|
||||
|
||||
|
|
@ -6,11 +5,6 @@ class TelechatAgendaItemAdmin(admin.ModelAdmin):
|
|||
pass
|
||||
admin.site.register(TelechatAgendaItem, TelechatAgendaItemAdmin)
|
||||
|
||||
if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
|
||||
class TelechatDatesAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
admin.site.register(TelechatDates, TelechatDatesAdmin)
|
||||
|
||||
class WGActionAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
admin.site.register(WGAction, WGActionAdmin)
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
from django.contrib import admin
|
||||
from django.conf import settings
|
||||
|
||||
from ietf.ietfworkflows.models import (AnnotationTag, WGWorkflow,
|
||||
Stream, StreamedID)
|
||||
from workflows.admin import StateInline
|
||||
|
||||
|
||||
class AnnotationTagInline(admin.TabularInline):
|
||||
model = AnnotationTag
|
||||
|
||||
|
||||
class IETFWorkflowAdmin(admin.ModelAdmin):
|
||||
inlines = [StateInline, AnnotationTagInline]
|
||||
admin.site.register(WGWorkflow, IETFWorkflowAdmin)
|
||||
|
||||
class StreamedIdAdmin(admin.ModelAdmin):
|
||||
list_display = [ 'id', 'draft', 'stream', ]
|
||||
search_fields = [ 'draft__filename', ]
|
||||
raw_id_fields = [ 'draft', ]
|
||||
pass
|
||||
admin.site.register(StreamedID, StreamedIdAdmin)
|
||||
|
||||
class StreamAdmin(admin.ModelAdmin):
|
||||
list_display = ['name', 'document_group_attribute', 'group_chair_attribute', 'workflow_link', ]
|
||||
if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
|
||||
admin.site.register(Stream, StreamAdmin)
|
||||
|
|
@ -10,14 +10,8 @@ admin.site.register(IprContact, IprContactAdmin)
|
|||
class IprDetailAdmin(admin.ModelAdmin):
|
||||
list_display = ['title', 'submitted_date', 'docs', ]
|
||||
search_fields = ['title', 'legal_name', ]
|
||||
pass
|
||||
admin.site.register(IprDetail, IprDetailAdmin)
|
||||
|
||||
class IprDraftAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
|
||||
admin.site.register(IprDraft, IprDraftAdmin)
|
||||
|
||||
class IprLicensingAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
admin.site.register(IprLicensing, IprLicensingAdmin)
|
||||
|
|
@ -26,11 +20,6 @@ class IprNotificationAdmin(admin.ModelAdmin):
|
|||
pass
|
||||
admin.site.register(IprNotification, IprNotificationAdmin)
|
||||
|
||||
class IprRfcAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
|
||||
admin.site.register(IprRfc, IprRfcAdmin)
|
||||
|
||||
class IprSelecttypeAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
admin.site.register(IprSelecttype, IprSelecttypeAdmin)
|
||||
|
|
@ -39,3 +28,4 @@ class IprUpdateAdmin(admin.ModelAdmin):
|
|||
pass
|
||||
admin.site.register(IprUpdate, IprUpdateAdmin)
|
||||
|
||||
admin.site.register(IprDocAlias)
|
||||
|
|
|
|||
|
|
@ -219,6 +219,10 @@ if settings.USE_DB_REDESIGN_PROXY_CLASSES or hasattr(settings, "IMPORTING_IPR"):
|
|||
else:
|
||||
return u"%s which applies to %s" % (self.ipr, self.doc_alias.name)
|
||||
|
||||
class Meta:
|
||||
verbose_name = "IPR document alias"
|
||||
verbose_name_plural = "IPR document aliases"
|
||||
|
||||
# proxy stuff
|
||||
IprDraftOld = IprDraft
|
||||
IprRfcOld = IprRfc
|
||||
|
|
|
|||
|
|
@ -1,149 +1,11 @@
|
|||
#coding: utf-8
|
||||
from django import template
|
||||
from django.conf import settings
|
||||
from django.contrib import admin
|
||||
from django.contrib.admin.util import unquote
|
||||
from django.core.exceptions import PermissionDenied
|
||||
from django.core.management import load_command_class
|
||||
from django.http import Http404
|
||||
from django.shortcuts import render_to_response
|
||||
from django.utils.encoding import force_unicode
|
||||
from django.utils.functional import update_wrapper
|
||||
from django.utils.html import escape
|
||||
from django.utils.translation import ugettext as _
|
||||
|
||||
from ietf.liaisons.models import (FromBodies, LiaisonDetail, LiaisonPurpose,
|
||||
SDOs, LiaisonManagers, SDOAuthorizedIndividual)
|
||||
from ietf.ietfauth.models import LegacyWgPassword, LegacyLiaisonUser
|
||||
|
||||
|
||||
class FromBodiesAdmin(admin.ModelAdmin):
|
||||
list_display = ['body_name', 'contact_link', 'other_sdo']
|
||||
if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
|
||||
admin.site.register(FromBodies, FromBodiesAdmin)
|
||||
|
||||
|
||||
class LiaisonDetailAdmin(admin.ModelAdmin):
|
||||
list_display = ['detail_id', 'title', 'legacy_from_body', 'to_body', 'submitted_date', 'purpose', 'related_to']
|
||||
ordering = ('title', )
|
||||
# fields = ('title', 'body','submitted_date', 'last_modified_date', 'to_email', 'cc1', 'cc2', 'to_poc',
|
||||
# 'response_contact', 'technical_contact', 'purpose', 'purpose_text', 'deadline_date', 'action_taken',
|
||||
# 'related_to')
|
||||
raw_id_fields=['person', 'related_to']
|
||||
if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
|
||||
admin.site.register(LiaisonDetail, LiaisonDetailAdmin)
|
||||
|
||||
class LiaisonPurposeAdmin(admin.ModelAdmin):
|
||||
ordering = ('purpose_text', )
|
||||
if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
|
||||
admin.site.register(LiaisonPurpose, LiaisonPurposeAdmin)
|
||||
|
||||
|
||||
class LiaisonManagersAdmin(admin.ModelAdmin):
|
||||
list_display = ['id', '__unicode__', 'person_link', 'user_name', 'groups', 'sdo_link', ]
|
||||
ordering = ('person__first_name', 'person__last_name' )
|
||||
# fields = ('person', 'sdo')
|
||||
raw_id_fields=['person']
|
||||
admin.site.register(LiaisonManagers, LiaisonManagersAdmin)
|
||||
|
||||
|
||||
class LiaisonManagersInline(admin.TabularInline):
|
||||
model = LiaisonManagers
|
||||
raw_id_fields=['person']
|
||||
|
||||
class SDOAuthorizedIndividualInline(admin.TabularInline):
|
||||
model = SDOAuthorizedIndividual
|
||||
raw_id_fields=['person']
|
||||
|
||||
class SDOsAdmin(admin.ModelAdmin):
|
||||
list_display = ['sdo_id', 'sdo_name', 'liaisonmanager_link', 'sdo_contact_link']
|
||||
inlines = [LiaisonManagersInline, SDOAuthorizedIndividualInline]
|
||||
|
||||
def get_urls(self):
|
||||
from django.conf.urls.defaults import patterns, url
|
||||
|
||||
def wrap(view):
|
||||
def wrapper(*args, **kwargs):
|
||||
return self.admin_site.admin_view(view)(*args, **kwargs)
|
||||
return update_wrapper(wrapper, view)
|
||||
|
||||
info = self.model._meta.app_label, self.model._meta.module_name
|
||||
|
||||
urls = patterns('',
|
||||
url(r'^reminder/$',
|
||||
wrap(self.send_reminder),
|
||||
name='%s_%s_reminder' % info),
|
||||
url(r'^(.+)/reminder/$',
|
||||
wrap(self.send_one_reminder),
|
||||
name='%s_%s_one_reminder' % info),
|
||||
)
|
||||
urls += super(SDOsAdmin, self).get_urls()
|
||||
return urls
|
||||
|
||||
def send_reminder(self, request, sdo=None):
|
||||
opts = self.model._meta
|
||||
app_label = opts.app_label
|
||||
|
||||
output = None
|
||||
sdo_pk = sdo and sdo.pk or None
|
||||
if request.method == 'POST' and request.POST.get('send', False):
|
||||
command = load_command_class('ietf.liaisons', 'remind_update_sdo_list')
|
||||
output=command.handle(return_output=True, sdo_pk=sdo_pk)
|
||||
output='\n'.join(output)
|
||||
|
||||
context = {
|
||||
'opts': opts,
|
||||
'has_change_permission': self.has_change_permission(request),
|
||||
'app_label': app_label,
|
||||
'output': output,
|
||||
'sdo': sdo,
|
||||
}
|
||||
return render_to_response('admin/liaisons/sdos/send_reminder.html',
|
||||
context,
|
||||
context_instance = template.RequestContext(request, current_app=self.admin_site.name),
|
||||
)
|
||||
|
||||
def send_one_reminder(self, request, object_id):
|
||||
model = self.model
|
||||
opts = model._meta
|
||||
|
||||
try:
|
||||
obj = self.queryset(request).get(pk=unquote(object_id))
|
||||
except model.DoesNotExist:
|
||||
obj = None
|
||||
|
||||
if not self.has_change_permission(request, obj):
|
||||
raise PermissionDenied
|
||||
|
||||
if obj is None:
|
||||
raise Http404(_('%(name)s object with primary key %(key)r does not exist.') % {'name': force_unicode(opts.verbose_name), 'key': escape(object_id)})
|
||||
|
||||
return self.send_reminder(request, sdo=obj)
|
||||
admin.site.register(SDOs, SDOsAdmin)
|
||||
|
||||
|
||||
class SDOAuthorizedIndividualAdmin(admin.ModelAdmin):
|
||||
list_display = ['id', 'person_link', 'user_name', 'groups', 'sdo_link']
|
||||
raw_id_fields=['person']
|
||||
admin.site.register(SDOAuthorizedIndividual, SDOAuthorizedIndividualAdmin)
|
||||
|
||||
|
||||
class LegacyWgPasswordAdmin(admin.ModelAdmin):
|
||||
list_display = ['pk', 'person_link', 'login_name', ]
|
||||
admin.site.register(LegacyWgPassword, LegacyWgPasswordAdmin)
|
||||
|
||||
|
||||
class LegacyLiaisonUserAdmin(admin.ModelAdmin):
|
||||
list_display = ['pk', 'person_link', 'login_name', 'user_level', 'comment', ]
|
||||
raw_id_fields = [ 'person', ]
|
||||
admin.site.register(LegacyLiaisonUser, LegacyLiaisonUserAdmin)
|
||||
from ietf.liaisons.models import *
|
||||
|
||||
class LiaisonStatementAdmin(admin.ModelAdmin):
|
||||
list_display = ['id', 'title', 'from_name', 'to_name', 'submitted', 'purpose', 'related_to']
|
||||
list_display_links = ['id', 'title']
|
||||
ordering = ('title', )
|
||||
raw_id_fields = ('from_contact', 'related_to', 'from_group', 'to_group', 'attachments')
|
||||
if settings.USE_DB_REDESIGN_PROXY_CLASSES:
|
||||
from ietf.liaisons.models import LiaisonStatement
|
||||
admin.site.register(LiaisonStatement, LiaisonStatementAdmin)
|
||||
|
||||
admin.site.register(LiaisonStatement, LiaisonStatementAdmin)
|
||||
|
|
|
|||
69
ietf/meeting/admin.py
Normal file
69
ietf/meeting/admin.py
Normal file
|
|
@ -0,0 +1,69 @@
|
|||
from django.contrib import admin
|
||||
|
||||
from ietf.meeting.models import *
|
||||
|
||||
class RoomInline(admin.TabularInline):
|
||||
model = Room
|
||||
|
||||
class MeetingAdmin(admin.ModelAdmin):
|
||||
list_display = ["number", "type", "date", "location"]
|
||||
list_filter = ["type"]
|
||||
search_fields = ["number"]
|
||||
ordering = ["-date"]
|
||||
inlines = [RoomInline]
|
||||
|
||||
def location(self, instance):
|
||||
loc = []
|
||||
if instance.city:
|
||||
loc.append(instance.city)
|
||||
if instance.country:
|
||||
loc.append(instance.get_country_display())
|
||||
|
||||
return u", ".join(loc)
|
||||
|
||||
admin.site.register(Meeting, MeetingAdmin)
|
||||
|
||||
|
||||
class TimeSlotAdmin(admin.ModelAdmin):
|
||||
list_display = ["meeting", "type", "name", "time", "duration", "location", "session_desc"]
|
||||
raw_id_fields = ["location", "session"]
|
||||
ordering = ["-time"]
|
||||
|
||||
def session_desc(self, instance):
|
||||
if instance.session:
|
||||
if instance.session.name:
|
||||
return instance.session.name
|
||||
elif instance.session.group:
|
||||
return u"%s (%s)" % (instance.session.group.name, instance.session.group.acronym)
|
||||
|
||||
return ""
|
||||
session_desc.short_description = "session"
|
||||
|
||||
admin.site.register(TimeSlot, TimeSlotAdmin)
|
||||
|
||||
|
||||
class ConstraintAdmin(admin.ModelAdmin):
|
||||
list_display = ["meeting", "source", "name_lower", "target"]
|
||||
raw_id_fields = ["meeting", "source", "target"]
|
||||
search_fields = ["source__name", "source__acronym", "target__name", "target__acronym"]
|
||||
ordering = ["-meeting__date"]
|
||||
|
||||
def name_lower(self, instance):
|
||||
return instance.name.name.lower()
|
||||
|
||||
name_lower.short_description = "constraint name"
|
||||
|
||||
admin.site.register(Constraint, ConstraintAdmin)
|
||||
|
||||
class SessionAdmin(admin.ModelAdmin):
|
||||
list_display = ["meeting", "name", "group", "attendees", "requested", "status"]
|
||||
raw_id_fields = ["meeting", "group", "requested_by", "materials"]
|
||||
search_fields = ["name", "group"]
|
||||
ordering = ["-requested"]
|
||||
|
||||
def name_lower(self, instance):
|
||||
return instance.name.name.lower()
|
||||
|
||||
name_lower.short_description = "constraint name"
|
||||
|
||||
admin.site.register(Session, SessionAdmin)
|
||||
|
|
@ -37,8 +37,12 @@ class Meeting(models.Model):
|
|||
break_area = models.CharField(blank=True, max_length=255)
|
||||
reg_area = models.CharField(blank=True, max_length=255)
|
||||
|
||||
def __str__(self):
|
||||
return "IETF-%s" % (self.number)
|
||||
def __unicode__(self):
|
||||
if self.type_id == "ietf":
|
||||
return "IETF-%s" % (self.number)
|
||||
else:
|
||||
return self.number
|
||||
|
||||
def time_zone_offset(self):
|
||||
return pytz.timezone(self.time_zone).localize(datetime.datetime.combine(self.date, datetime.time(0, 0))).strftime("%z")
|
||||
def get_meeting_date (self,offset):
|
||||
|
|
@ -141,7 +145,7 @@ class Session(models.Model):
|
|||
requested = models.DateTimeField(default=datetime.datetime.now)
|
||||
requested_by = models.ForeignKey(Person)
|
||||
requested_duration = TimedeltaField(default=0)
|
||||
comments = models.TextField()
|
||||
comments = models.TextField(blank=True)
|
||||
status = models.ForeignKey(SessionStatusName)
|
||||
scheduled = models.DateTimeField(null=True, blank=True)
|
||||
modified = models.DateTimeField(default=datetime.datetime.now)
|
||||
|
|
|
|||
|
|
@ -1,93 +0,0 @@
|
|||
#coding: utf-8
|
||||
from django.contrib import admin
|
||||
from django.conf import settings
|
||||
from ietf.proceedings.models import *
|
||||
|
||||
class IESGHistoryAdmin(admin.ModelAdmin):
|
||||
list_display = ['meeting', 'area', 'person']
|
||||
list_filter = ['meeting', ]
|
||||
raw_id_fields = ["person", ]
|
||||
if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
|
||||
admin.site.register(IESGHistory, IESGHistoryAdmin)
|
||||
|
||||
class MeetingAdmin(admin.ModelAdmin):
|
||||
list_display=('meeting_num', 'start_date', 'city', 'state', 'country', 'time_zone')
|
||||
if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
|
||||
admin.site.register(Meeting, MeetingAdmin)
|
||||
|
||||
class MeetingRoomAdmin(admin.ModelAdmin):
|
||||
list_display = ['room_id', 'meeting', 'room_name']
|
||||
list_filter = ['meeting', ]
|
||||
pass
|
||||
if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
|
||||
admin.site.register(MeetingRoom, MeetingRoomAdmin)
|
||||
|
||||
class MeetingTimeAdmin(admin.ModelAdmin):
|
||||
list_filter = ['meeting', ]
|
||||
pass
|
||||
if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
|
||||
admin.site.register(MeetingTime, MeetingTimeAdmin)
|
||||
|
||||
class MeetingVenueAdmin(admin.ModelAdmin):
|
||||
list_display = [ 'meeting_num', 'break_area_name', 'reg_area_name' ]
|
||||
pass
|
||||
if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
|
||||
admin.site.register(MeetingVenue, MeetingVenueAdmin)
|
||||
|
||||
class MinuteAdmin(admin.ModelAdmin):
|
||||
list_filter = ['meeting', ]
|
||||
pass
|
||||
admin.site.register(Minute, MinuteAdmin)
|
||||
|
||||
class NonSessionAdmin(admin.ModelAdmin):
|
||||
list_display = ['meeting', 'day', 'non_session_ref', 'time_desc', 'show_break_location', ]
|
||||
list_filter = ['meeting', ]
|
||||
pass
|
||||
admin.site.register(NonSession, NonSessionAdmin)
|
||||
|
||||
class NonSessionRefAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
admin.site.register(NonSessionRef, NonSessionRefAdmin)
|
||||
|
||||
class SessionConflictAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
admin.site.register(SessionConflict, SessionConflictAdmin)
|
||||
|
||||
class SessionNameAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
admin.site.register(SessionName, SessionNameAdmin)
|
||||
|
||||
class SlideAdmin(admin.ModelAdmin):
|
||||
list_filter = ['meeting', ]
|
||||
pass
|
||||
if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
|
||||
admin.site.register(Slide, SlideAdmin)
|
||||
|
||||
class SwitchesAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
admin.site.register(Switches, SwitchesAdmin)
|
||||
|
||||
class WgAgendaAdmin(admin.ModelAdmin):
|
||||
list_filter = ['meeting', ]
|
||||
pass
|
||||
admin.site.register(WgAgenda, WgAgendaAdmin)
|
||||
|
||||
class SessionStatusAdmin(admin.ModelAdmin):
|
||||
list_display = ['id', 'name' ]
|
||||
# list_filter = ['meeting', ]
|
||||
pass
|
||||
admin.site.register(SessionStatus, SessionStatusAdmin)
|
||||
|
||||
class WgMeetingSessionAdmin(admin.ModelAdmin):
|
||||
list_display = ['session_id', 'meeting', 'acronym', 'number_attendee', 'status', 'approval_ad', 'scheduled_date', 'last_modified_date', 'special_req', 'ad_comments']
|
||||
list_filter = ['meeting', ]
|
||||
pass
|
||||
if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
|
||||
admin.site.register(WgMeetingSession, WgMeetingSessionAdmin)
|
||||
|
||||
class WgProceedingsActivitiesAdmin(admin.ModelAdmin):
|
||||
list_display = ['meeting', 'group_acronym', 'activity', 'act_date', 'act_time', 'act_by', ]
|
||||
list_filter = ['meeting', ]
|
||||
pass
|
||||
admin.site.register(WgProceedingsActivities, WgProceedingsActivitiesAdmin)
|
||||
|
||||
|
|
@ -14,4 +14,4 @@
|
|||
<td class="writeup_date">
|
||||
{% writeupdate doc %}
|
||||
</td>
|
||||
</tr>
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
from django.contrib import admin
|
||||
|
||||
from permissions.models import ObjectPermission
|
||||
admin.site.register(ObjectPermission)
|
||||
|
||||
from permissions.models import Permission
|
||||
admin.site.register(Permission)
|
||||
|
||||
from permissions.models import Role
|
||||
admin.site.register(Role)
|
||||
|
||||
from permissions.models import PrincipalRoleRelation
|
||||
admin.site.register(PrincipalRoleRelation)
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
from django.contrib import admin
|
||||
from workflows.models import State
|
||||
from workflows.models import StateInheritanceBlock
|
||||
from workflows.models import StatePermissionRelation
|
||||
from workflows.models import StateObjectRelation
|
||||
from workflows.models import Transition
|
||||
from workflows.models import Workflow
|
||||
from workflows.models import WorkflowObjectRelation
|
||||
from workflows.models import WorkflowModelRelation
|
||||
from workflows.models import WorkflowPermissionRelation
|
||||
|
||||
class StateInline(admin.TabularInline):
|
||||
model = State
|
||||
|
||||
class WorkflowAdmin(admin.ModelAdmin):
|
||||
inlines = [
|
||||
StateInline,
|
||||
]
|
||||
|
||||
admin.site.register(Workflow, WorkflowAdmin)
|
||||
|
||||
admin.site.register(State)
|
||||
admin.site.register(StateInheritanceBlock)
|
||||
admin.site.register(StateObjectRelation)
|
||||
admin.site.register(StatePermissionRelation)
|
||||
admin.site.register(Transition)
|
||||
admin.site.register(WorkflowObjectRelation)
|
||||
admin.site.register(WorkflowModelRelation)
|
||||
admin.site.register(WorkflowPermissionRelation)
|
||||
|
||||
Loading…
Reference in a new issue