Removed old Django 0.96 Admin classes

- Legacy-Id: 2054
This commit is contained in:
Pasi Eronen 2010-03-09 07:37:46 +00:00
parent a16af088c0
commit db090de329
9 changed files with 3 additions and 226 deletions
ietf
announcements
idrfc
idtracker
iesg
ipr
liaisons
meeting
proceedings
redirects

View file

@ -25,8 +25,6 @@ class AnnouncedFrom(models.Model):
# ("ietf_execdir_announcedfromperm", "Can send messages from IETF Executive Director"),
# ("other_announcedfromperm", "Can send announcements from others"),
#)
class Admin:
pass
class AnnouncedTo(models.Model):
announced_to_id = models.AutoField(primary_key=True)
@ -36,8 +34,6 @@ class AnnouncedTo(models.Model):
return self.announced_to
class Meta:
db_table = 'announced_to'
class Admin:
pass
class Announcement(models.Model):
announcement_id = models.AutoField(primary_key=True)
@ -64,11 +60,6 @@ class Announcement(models.Model):
return self.announced_from
class Meta:
db_table = 'announcements'
class Admin:
list_display = ('announced_from', 'announced_to', 'announced_date', 'subject')
date_hierarchy = 'announced_date'
list_filter = ['nomcom', 'manually_added']
pass
class ScheduledAnnouncement(models.Model):
mail_sent = models.BooleanField()
@ -94,8 +85,6 @@ class ScheduledAnnouncement(models.Model):
return "Scheduled Announcement from %s to %s on %s %s" % (self.from_val, self.to_val, self.to_be_sent_date, self.to_be_sent_time)
class Meta:
db_table = 'scheduled_announcements'
class Admin:
pass
# changes done by convert-096.py:changed maxlength to max_length
# removed filter_interface

View file

@ -52,8 +52,6 @@ class RfcEditorQueue(models.Model):
return "RfcEditorQueue"+str([self.draft, self.date_received, self.state, self.state_date, self.stream])
class Meta:
db_table = "rfc_editor_queue_mirror"
class Admin:
pass
class RfcEditorQueueRef(models.Model):
source = models.ForeignKey(InternetDraft, db_column="source", related_name="rfc_editor_queue_refs")
@ -62,8 +60,6 @@ class RfcEditorQueueRef(models.Model):
direct = models.BooleanField()
class Meta:
db_table = "rfc_editor_queue_mirror_refs"
class Admin:
pass
class RfcIndex(models.Model):
rfc_number = models.IntegerField(primary_key=True)
@ -82,8 +78,6 @@ class RfcIndex(models.Model):
return "RfcIndex"+str(self.rfc_number)
class Meta:
db_table = "rfc_index_mirror"
class Admin:
pass
class DraftVersions(models.Model):
# Django does not support multi-column primary keys, so
@ -97,8 +91,4 @@ class DraftVersions(models.Model):
return "DraftVersions"+self.filename+self.revision+str(self.revision_date)
class Meta:
db_table = "draft_versions_mirror"
class Admin:
pass
# changes done by convert-096.py:changed maxlength to max_length

View file

@ -20,9 +20,6 @@ class Acronym(models.Model):
return self.acronym
class Meta:
db_table = "acronym"
class Admin:
list_display = ('acronym', 'name')
pass
class AreaStatus(models.Model):
status_id = models.AutoField(primary_key=True)
@ -31,8 +28,6 @@ class AreaStatus(models.Model):
return self.status
class Meta:
db_table = 'area_status'
class Admin:
pass
# I think equiv_group_flag is historical.
class IDState(models.Model):
@ -48,8 +43,6 @@ class IDState(models.Model):
class Meta:
db_table = 'ref_doc_states_new'
ordering = ['document_state_id']
class Admin:
pass
class IDNextState(models.Model):
cur_state = models.ForeignKey(IDState, related_name='nextstate')
@ -59,8 +52,6 @@ class IDNextState(models.Model):
return "%s -> %s" % (self.cur_state.state, self.next_state.state )
class Meta:
db_table = 'ref_next_states_new'
class Admin:
pass
class IDSubState(models.Model):
sub_state_id = models.AutoField(primary_key=True)
@ -71,8 +62,6 @@ class IDSubState(models.Model):
class Meta:
db_table = 'sub_state'
ordering = ['sub_state_id']
class Admin:
pass
class Area(models.Model):
ACTIVE=1
@ -95,9 +84,6 @@ class Area(models.Model):
class Meta:
db_table = 'areas'
verbose_name="area"
class Admin:
list_display = ('area_acronym', 'status')
pass
class AreaWGURL(models.Model):
id = models.AutoField(primary_key=True, db_column='area_ID')
@ -120,8 +106,6 @@ class IDStatus(models.Model):
db_table = "id_status"
verbose_name="I-D Status"
verbose_name_plural="I-D Statuses"
class Admin:
pass
class IDIntendedStatus(models.Model):
intended_status_id = models.AutoField(primary_key=True)
@ -132,8 +116,6 @@ class IDIntendedStatus(models.Model):
db_table = "id_intended_status"
verbose_name="I-D Intended Publication Status"
verbose_name_plural="I-D Intended Publication Statuses"
class Admin:
pass
class InternetDraft(models.Model):
DAYS_TO_EXPIRE=185
@ -255,13 +237,6 @@ class InternetDraft(models.Model):
class Meta:
db_table = "internet_drafts"
class Admin:
search_fields = ['filename','title']
list_display = ('filename', 'revision', 'title', 'status')
list_filter = ['status']
pass
#date_hierarchy = 'revision_date'
#list_filter = ['revision_date']
class PersonOrOrgInfo(models.Model):
person_or_org_tag = models.AutoField(primary_key=True)
@ -322,17 +297,6 @@ class PersonOrOrgInfo(models.Model):
ordering = ['last_name']
verbose_name="Rolodex Entry"
verbose_name_plural="Rolodex"
class Admin:
search_fields = ['first_name','last_name']
fields = (
(None, {
'fields': (('first_name', 'middle_initial', 'last_name'), ('name_suffix', 'modified_by'))
}),
('Obsolete Info', {
'classes': 'collapse',
'fields': ('record_type', 'created_by', 'address_type')
}))
pass
# could use a mapping for user_level
class IESGLogin(models.Model):
@ -362,10 +326,6 @@ class IESGLogin(models.Model):
active_iesg = staticmethod(active_iesg)
class Meta:
db_table = 'iesg_login'
class Admin:
list_display = ('login_name', 'first_name', 'last_name', 'user_level')
ordering = ['user_level','last_name']
pass
class AreaDirector(models.Model):
area = models.ForeignKey(Area, db_column='area_acronym_id', null=True)
@ -379,8 +339,7 @@ class AreaDirector(models.Model):
return "?%d? AD" % self.area_id
class Meta:
db_table = 'area_directors'
class Admin:
pass
###
# RFC tables
@ -394,8 +353,6 @@ class RfcIntendedStatus(models.Model):
class Meta:
db_table = 'rfc_intend_status'
verbose_name = 'RFC Intended Status Field'
class Admin:
pass
class RfcStatus(models.Model):
status_id = models.AutoField(primary_key=True)
@ -406,8 +363,6 @@ class RfcStatus(models.Model):
db_table = 'rfc_status'
verbose_name = 'RFC Status'
verbose_name_plural = 'RFC Statuses'
class Admin:
pass
class Rfc(models.Model):
ONLINE_CHOICES=(('YES', 'Yes'), ('NO', 'No'))
@ -479,25 +434,6 @@ class Rfc(models.Model):
db_table = 'rfcs'
verbose_name = 'RFC'
verbose_name_plural = 'RFCs'
class Admin:
search_fields = ['title']
list_display = ['rfc_number', 'title']
fields = (
(None, {
'fields': ('rfc_number', 'title', 'group_acronym', 'area_acronym', 'status', 'comments', 'last_modified_date')
}),
('Metadata', {
'classes': 'collapse',
'fields': (('online_version', 'txt_page_count'), ('fyi_number', 'std_number'))
}),
('Standards Track Dates', {
'classes': 'collapse',
'fields': ('rfc_published_date', ('proposed_date', 'draft_date'), ('standard_date', 'historic_date'))
}),
('Last Call / Ballot Info', {
'classes': 'collapse',
'fields': ('intended_status', ('lc_sent_date', 'lc_expiration_date'), ('b_sent_date', 'b_approve_date'))
}))
class RfcAuthor(models.Model):
rfc = models.ForeignKey(Rfc, unique=True, db_column='rfc_number', related_name='authors')
@ -518,8 +454,6 @@ class RfcObsolete(models.Model):
db_table = 'rfcs_obsolete'
verbose_name = 'RFC updates or obsoletes'
verbose_name_plural = verbose_name
class Admin:
pass
## End RFC Tables
@ -557,8 +491,6 @@ class BallotInfo(models.Model): # Added by Michael Lee
return ret
class Meta:
db_table = 'ballot_info'
class Admin:
pass
class IDInternal(models.Model):
"""
@ -658,10 +590,6 @@ class IDInternal(models.Model):
class Meta:
db_table = 'id_internal'
verbose_name = 'IDTracker Draft'
class Admin:
list_display = ['draft', 'token_email', 'note' ]
ordering = ['draft', ]
pass
class DocumentComment(models.Model):
BALLOT_CHOICES = (
@ -734,8 +662,6 @@ class Position(models.Model):
db_table = 'ballots'
unique_together = (('ballot', 'ad'), )
verbose_name = "IESG Ballot Position"
class Admin:
pass
class IESGComment(models.Model):
ballot = models.ForeignKey(BallotInfo, related_name="comments")
@ -753,8 +679,6 @@ class IESGComment(models.Model):
unique_together = (('ballot', 'ad'), )
verbose_name = 'IESG Comment Text'
verbose_name_plural = 'IESG Comments'
class Admin:
pass
class IESGDiscuss(models.Model):
ballot = models.ForeignKey(BallotInfo, related_name="discusses")
@ -772,8 +696,6 @@ class IESGDiscuss(models.Model):
unique_together = (('ballot', 'ad'), )
verbose_name = 'IESG Discuss Text'
verbose_name_plural = 'IESG Discusses'
class Admin:
pass
class IDAuthor(models.Model):
document = models.ForeignKey(InternetDraft, db_column='id_document_tag', related_name='authors')
@ -840,11 +762,6 @@ class EmailAddress(models.Model):
#unique_together = (('email_priority', 'person_or_org'), )
# with this, I get 'ChangeManipulator' object has no attribute 'isUniqueemail_priority_person_or_org'
verbose_name_plural = 'Email addresses'
class Admin:
# Even though this is edit_inline, we want to be able
# to search for email addresses.
search_fields = [ 'address' ]
list_display = ( 'person_or_org', 'address', 'type', 'priority' )
class PhoneNumber(models.Model):
person_or_org = models.ForeignKey(PersonOrOrgInfo, db_column='person_or_org_tag')
@ -865,8 +782,6 @@ class WGType(models.Model):
return self.type
class Meta:
db_table = 'g_type'
class Admin:
pass
class WGStatus(models.Model):
status_id = models.AutoField(primary_key=True)
@ -875,8 +790,6 @@ class WGStatus(models.Model):
return self.status
class Meta:
db_table = 'g_status'
class Admin:
pass
class IETFWG(models.Model):
ACTIVE = 1
@ -943,14 +856,6 @@ class IETFWG(models.Model):
db_table = 'groups_ietf'
ordering = ['?'] # workaround django wanting to sort by acronym but not joining with it
verbose_name = 'IETF Working Group'
class Admin:
search_fields = ['group_acronym__acronym', 'group_acronym__name']
# Until the database is consistent, including area_director in
# this list means that we'll have FK failures, so skip it for now.
list_display = ('group_acronym', 'group_type', 'status', 'area_acronym', 'start_date', 'concluded_date')
list_filter = ['status', 'group_type']
#list_display = ('group_acronym', 'group_type', 'status', 'area_director')
#list_filter = ['status', 'group_type', 'area_director']
class WGChair(models.Model):
person = models.ForeignKey(PersonOrOrgInfo, db_column='person_or_org_tag', unique=True)
@ -1025,11 +930,6 @@ class GoalMilestone(models.Model):
verbose_name = 'IETF WG Goal or Milestone'
verbose_name_plural = 'IETF WG Goals or Milestones'
ordering = ['expected_due_date']
class Admin:
list_display = ('group_acronym', 'description', 'expected_due_date', 'done')
date_hierarchy = 'expected_due_date'
list_filter = ['done']
pass
#### end wg stuff
@ -1061,8 +961,6 @@ class Role(models.Model):
return self.role_name
class Meta:
db_table = 'chairs'
class Admin:
pass
class ChairsHistory(models.Model):
chair_type = models.ForeignKey(Role)
@ -1074,9 +972,6 @@ class ChairsHistory(models.Model):
return str(self.person)
class Meta:
db_table = 'chairs_history'
class Admin:
list_display = ('person', 'chair_type', 'start_year', 'end_year')
pass
#
# IRTF RG info
@ -1091,8 +986,6 @@ class IRTF(models.Model):
class Meta:
db_table = 'irtf'
verbose_name="IRTF Research Group"
class Admin:
pass
class IRTFChair(models.Model):
irtf = models.ForeignKey(IRTF)

View file

@ -49,8 +49,6 @@ from ietf.idtracker.models import Acronym
# db_table = 'telechat_minutes'
# verbose_name = "Telechat Minute Text"
# verbose_name_plural = "Telechat Minutes"
# class Admin:
# pass
class TelechatDates(models.Model):
date1 = models.DateField(primary_key=True, null=True, blank=True)
@ -74,8 +72,6 @@ class TelechatDates(models.Model):
class Meta:
db_table = "telechat_dates"
verbose_name = "Next Telechat Date"
class Admin:
pass
class TelechatAgendaItem(models.Model):
TYPE_CHOICES = (
@ -93,8 +89,6 @@ class TelechatAgendaItem(models.Model):
#decision = models.TextField(null=True,blank=True)
class Meta:
db_table = 'templates'
class Admin:
pass
class WGAction(models.Model):
CATEGORY_CHOICES = (
@ -118,8 +112,3 @@ class WGAction(models.Model):
db_table = 'group_internal'
ordering = ['-telechat_date']
verbose_name = "WG Action"
class Admin:
pass
# changes done by convert-096.py:changed maxlength to max_length

View file

@ -44,8 +44,6 @@ class IprSelecttype(models.Model):
return self.type_display
class Meta:
db_table = 'ipr_selecttype'
class Admin:
pass
class IprLicensing(models.Model):
licensing_option = models.AutoField(primary_key=True)
@ -54,8 +52,6 @@ class IprLicensing(models.Model):
return self.value;
class Meta:
db_table = 'ipr_licensing'
class Admin:
pass
class IprDetail(models.Model):
@ -128,8 +124,6 @@ class IprDetail(models.Model):
return None
class Meta:
db_table = 'ipr_detail'
class Admin:
pass
class IprContact(models.Model):
TYPE_CHOICES = (
@ -152,11 +146,6 @@ class IprContact(models.Model):
return self.name or '<no name>'
class Meta:
db_table = 'ipr_contacts'
class Admin:
# would like contact_type
list_display = ('__str__', 'ipr')
pass
class IprDraft(models.Model):
@ -167,8 +156,6 @@ class IprDraft(models.Model):
return "%s which applies to %s-%s" % ( self.ipr, self.document, self.revision )
class Meta:
db_table = 'ipr_ids'
class Admin:
pass
class IprNotification(models.Model):
ipr = models.ForeignKey(IprDetail)
@ -179,8 +166,6 @@ class IprNotification(models.Model):
return "IPR notification for %s sent %s %s" % (self.ipr, self.date_sent, self.time_sent)
class Meta:
db_table = 'ipr_notifications'
class Admin:
pass
class IprRfc(models.Model):
ipr = models.ForeignKey(IprDetail, related_name='rfcs')
@ -189,8 +174,6 @@ class IprRfc(models.Model):
return "%s applies to RFC%04d" % ( self.ipr, self.document_id )
class Meta:
db_table = 'ipr_rfcs'
class Admin:
pass
class IprUpdate(models.Model):
id = models.IntegerField(primary_key=True)
@ -200,8 +183,6 @@ class IprUpdate(models.Model):
processed = models.IntegerField(null=True, blank=True)
class Meta:
db_table = 'ipr_updates'
class Admin:
pass
# changes done by convert-096.py:changed maxlength to max_length
# removed core

View file

@ -11,8 +11,6 @@ class LiaisonPurpose(models.Model):
return self.purpose_text
class Meta:
db_table = 'liaison_purpose'
class Admin:
pass
class FromBodies(models.Model):
from_id = models.AutoField(primary_key=True)
@ -25,8 +23,6 @@ class FromBodies(models.Model):
return self.body_name
class Meta:
db_table = 'from_bodies'
class Admin:
pass
class LiaisonDetail(models.Model):
detail_id = models.AutoField(primary_key=True)
@ -93,8 +89,6 @@ class LiaisonDetail(models.Model):
return '/liaison/%d/' % self.detail_id
class Meta:
db_table = 'liaison_detail'
class Admin:
pass
# This table is not used by any code right now, and according to Glen,
# probably not currently (Aug 2009) maintained by the secretariat.
@ -110,8 +104,6 @@ class LiaisonDetail(models.Model):
# return None
# class Meta:
# db_table = 'sdos'
# class Admin:
# pass
# This table is not used by any code right now, and according to Glen,
# probably not currently (Aug 2009) maintained by the secretariat.
@ -138,8 +130,6 @@ class LiaisonDetail(models.Model):
# return self.title
# class Meta:
# db_table = 'liaisons_interim'
# class Admin:
# pass
class Uploads(models.Model):
file_id = models.AutoField(primary_key=True)
@ -159,8 +149,6 @@ class Uploads(models.Model):
# email_priority = models.IntegerField(null=True, blank=True)
# class Meta:
# db_table = 'sdo_chairs'
# class Admin:
# pass
# changes done by convert-096.py:changed maxlength to max_length
# removed core

View file

@ -1,16 +1,3 @@
# Copyright The IETF Trust 2007, All Rights Reserved
#from django.db import models
#from django.db import models
#from ietf.proceedings import models
#from ietf.proceedings.models import Meeting, MeetingVenue, WgMeetingSession, WgAgenda
#from ietf.proceedings.models import NonSession, NonSessionRef,SessionName
#import datetime
# Create your models here.
# Meeting models can be found under ../proceedings/
# Meeting models can be found under ../proceedings/

View file

@ -148,9 +148,6 @@ class Meeting(models.Model):
return self.meeting_num
class Meta:
db_table = 'meetings'
class Admin:
list_display= ('meeting_num', 'start_date', 'city', 'state', 'country', 'time_zone')
pass
class MeetingVenue(models.Model):
meeting_num = models.ForeignKey(Meeting, db_column='meeting_num', unique=True)
@ -160,8 +157,6 @@ class MeetingVenue(models.Model):
return "IETF %s" % (self.meeting_num_id)
class Meta:
db_table = 'meeting_venues'
class Admin:
pass
class NonSessionRef(models.Model):
name = models.CharField(max_length=255)
@ -169,8 +164,6 @@ class NonSessionRef(models.Model):
return self.name
class Meta:
db_table = 'non_session_ref'
class Admin:
pass
class NonSession(models.Model):
non_session_id = models.AutoField(primary_key=True)
@ -186,8 +179,6 @@ class NonSession(models.Model):
return "** %s %s @%s" % (self.time_desc, self.non_session_ref, self.meeting_id)
class Meta:
db_table = 'non_session'
class Admin:
pass
class Proceeding(models.Model):
meeting_num = models.ForeignKey(Meeting, db_column='meeting_num', unique=True, primary_key=True)
@ -203,8 +194,6 @@ class Proceeding(models.Model):
class Meta:
db_table = 'proceedings'
ordering = ['?'] # workaround for FK primary key
#class Admin:
# pass # admin site doesn't like something about meeting_num
class SessionConflict(models.Model):
group_acronym = models.ForeignKey(Acronym, related_name='conflicts_set')
@ -214,8 +203,6 @@ class SessionConflict(models.Model):
return "At IETF %s, %s conflicts with %s" % ( self.meeting_num_id, self.group_acronym.acronym, self.conflict_gid.acronym)
class Meta:
db_table = 'session_conflicts'
class Admin:
pass
class SessionName(models.Model):
session_name_id = models.AutoField(primary_key=True)
@ -224,8 +211,7 @@ class SessionName(models.Model):
return self.session_name
class Meta:
db_table = 'session_names'
class Admin:
pass
class IESGHistory(models.Model):
meeting = models.ForeignKey(Meeting, db_column='meeting_num')
area = models.ForeignKey(Area, db_column='area_acronym_id')
@ -234,8 +220,6 @@ class IESGHistory(models.Model):
return "%s (%s)" % (self.person,self.area)
class Meta:
db_table = 'iesg_history'
class Admin:
pass
class MeetingTime(models.Model):
time_id = models.AutoField(primary_key=True)
@ -297,8 +281,6 @@ class MeetingTime(models.Model):
return self.session_name_id in [9, 10]
class Meta:
db_table = 'meeting_times'
class Admin:
pass
class MeetingRoom(models.Model):
room_id = models.AutoField(primary_key=True)
@ -308,8 +290,6 @@ class MeetingRoom(models.Model):
return "[%d] %s" % (self.meeting_id, self.room_name)
class Meta:
db_table = 'meeting_rooms'
class Admin:
pass
class WgMeetingSession(models.Model, ResolveAcronym):
session_id = models.AutoField(primary_key=True)
@ -418,8 +398,6 @@ class WgMeetingSession(models.Model, ResolveAcronym):
return False
class Meta:
db_table = 'wg_meeting_sessions'
class Admin:
pass
_dirs = {}
class WgAgenda(models.Model, ResolveAcronym):
@ -432,8 +410,6 @@ class WgAgenda(models.Model, ResolveAcronym):
return "Agenda for %s at IETF %s" % (self.acronym(), self.meeting_id)
class Meta:
db_table = 'wg_agenda'
class Admin:
pass
class Minute(models.Model, ResolveAcronym):
meeting = models.ForeignKey(Meeting, db_column='meeting_num')
@ -445,8 +421,6 @@ class Minute(models.Model, ResolveAcronym):
return "Minutes for %s at IETF %s" % (self.acronym(), self.meeting_id)
class Meta:
db_table = 'minutes'
class Admin:
pass
# It looks like Switches was meant for something bigger, but
# is only used for the agenda generation right now so we'll
@ -462,8 +436,6 @@ class Switches(models.Model):
return self.name
class Meta:
db_table = 'switches'
class Admin:
pass
# Empty table, don't pretend that it exists.
#class SlideTypes(models.Model):
@ -473,8 +445,6 @@ class Switches(models.Model):
# return self.type
# class Meta:
# db_table = 'slide_types'
# class Admin:
# pass
class Slide(models.Model, ResolveAcronym):
SLIDE_TYPE_CHOICES=(
@ -514,8 +484,6 @@ class Slide(models.Model, ResolveAcronym):
return "%s/slides/%s-%s%s" % (dir,self.acronym(),self.slide_num,ext)
class Meta:
db_table = 'slides'
class Admin:
pass
class WgProceedingsActivities(models.Model, ResolveAcronym):
id = models.AutoField(primary_key=True)
@ -534,8 +502,6 @@ class WgProceedingsActivities(models.Model, ResolveAcronym):
return "this is WgProceedingsActivities.__str__"
class Meta:
db_table = 'wg_proceedings_activities'
class Admin:
pass
# changes done by convert-096.py:changed maxlength to max_length
# removed core

View file

@ -21,8 +21,6 @@ class Redirect(models.Model):
remove = models.CharField(max_length=50, blank=True)
def __str__(self):
return "%s -> %s/%s" % (self.cgi, self.url, self.rest)
class Admin:
pass
class Suffix(models.Model):
"""This is a "rest" and "remove" (see Redirect class)
@ -34,8 +32,6 @@ class Suffix(models.Model):
return "-> %s - %s" % (self.rest, self.remove)
class Meta:
verbose_name_plural="Suffixes"
class Admin:
pass
class Command(models.Model):
"""When a request comes in with a command= argument,
@ -55,8 +51,6 @@ class Command(models.Model):
return ret
class Meta:
unique_together = (("script", "command"), )
class Admin:
pass
# changes done by convert-096.py:changed maxlength to max_length
# removed core