Removed old Django 0.96 Admin classes

 - Legacy-Id: 2054

Author: pasieronen

ietf/announcements/models.py

@@ -25,8 +25,6 @@ class Meta:
 	#    ("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 @@ def __str__(self):
 	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 @@ def from_name(self):
 	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 @@ def __str__(self):
 	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

ietf/idrfc/models.py

@@ -52,8 +52,6 @@ def __str__(self):
         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 @@ def __str__(self):
         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 @@ def __str__(self):
         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

ietf/idtracker/models.py

@@ -20,9 +20,6 @@ def __str__(self):
         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 @@ def __str__(self):
 	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 @@ def choices():
     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 @@ def __str__(self):
 	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 @@ def __str__(self):
     class Meta:
         db_table = 'sub_state'
 	ordering = ['sub_state_id']
-    class Admin:
-	pass
 
 class Area(models.Model):
     ACTIVE=1
@@ -95,9 +84,6 @@ def active_areas():
     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 Meta:
         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 Meta:
         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 @@ def clean_abstract(self):
 
     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 Meta:
         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 @@ def active_iesg():
     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 @@ def role(self):
 	    return "?%d? AD" % self.area_id
     class Meta:
         db_table = 'area_directors'
-    class Admin:
-	pass
+
 
 ###
 # RFC tables
@@ -394,8 +353,6 @@ def __str__(self):
     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 Meta:
         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 Meta:
         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 Meta:
         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 @@ def active_positions(self):
 	return ret 
     class Meta:
         db_table = 'ballot_info'
-    class Admin:
-	pass
 
 class IDInternal(models.Model):
     """
@@ -658,10 +590,6 @@ def docstate(self):
     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 Meta:
         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 Meta:
 	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 Meta:
 	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 Meta:
 	#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 @@ def __str__(self):
 	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 @@ def __str__(self):
 	return self.status
     class Meta:
         db_table = 'g_status'
-    class Admin:
-	pass
 
 class IETFWG(models.Model):
     ACTIVE = 1
@@ -943,14 +856,6 @@ class Meta:
         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 Meta:
 	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 @@ def role(self):
 	    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 @@ def __str__(self):
 	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 @@ def __str__(self):
     class Meta:
         db_table = 'irtf'
         verbose_name="IRTF Research Group"
-    class Admin:
-	pass
 
 class IRTFChair(models.Model):
     irtf = models.ForeignKey(IRTF)