Minor admin site tweaks

- Legacy-Id: 2081

ietf/announcements/admin.py

@@ -14,6 +14,7 @@ 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):

ietf/announcements/models.py

@@ -86,6 +86,4 @@ class ScheduledAnnouncement(models.Model):
     class Meta:
         db_table = 'scheduled_announcements'
 
-# changes done by convert-096.py:changed maxlength to max_length
-# removed filter_interface
-# removed raw_id_admin
+

ietf/idtracker/admin.py

@@ -11,7 +11,7 @@ class AreaAdmin(admin.ModelAdmin):
 admin.site.register(Area, AreaAdmin)
 
 class AreaDirectorAdmin(admin.ModelAdmin):
-    pass
+    raw_id_fields=['person']
 admin.site.register(AreaDirector, AreaDirectorAdmin)
 
 class AreaStatusAdmin(admin.ModelAdmin):
@@ -67,16 +67,17 @@ class IDSubStateAdmin(admin.ModelAdmin):
 admin.site.register(IDSubState, IDSubStateAdmin)
 
 class IESGCommentAdmin(admin.ModelAdmin):
-    pass
+    raw_id_fields = ['ballot','ad']
 admin.site.register(IESGComment, IESGCommentAdmin)
 
 class IESGDiscussAdmin(admin.ModelAdmin):
-    pass
+    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']
 admin.site.register(IESGLogin, IESGLoginAdmin)
 
 class IETFWGAdmin(admin.ModelAdmin):
@@ -93,6 +94,7 @@ 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):
@@ -101,7 +103,7 @@ class PersonOrOrgInfoAdmin(admin.ModelAdmin):
 admin.site.register(PersonOrOrgInfo, PersonOrOrgInfoAdmin)
 
 class PositionAdmin(admin.ModelAdmin):
-    pass
+    raw_id_fields=['ballot','ad']
 admin.site.register(Position, PositionAdmin)
 
 class RfcAdmin(admin.ModelAdmin):
@@ -115,7 +117,7 @@ class RfcIntendedStatusAdmin(admin.ModelAdmin):
 admin.site.register(RfcIntendedStatus, RfcIntendedStatusAdmin)
 
 class RfcObsoleteAdmin(admin.ModelAdmin):
-    pass
+    raw_id_fields=['rfc','rfc_acted_on']
 admin.site.register(RfcObsolete, RfcObsoleteAdmin)
 
 class RfcStatusAdmin(admin.ModelAdmin):

ietf/idtracker/models.py

@@ -27,6 +27,8 @@ class AreaStatus(models.Model):
     def __str__(self):
 	return self.status
     class Meta:
+        verbose_name = "Area Status"
+        verbose_name_plural = "Area Statuses"
         db_table = 'area_status'
 
 # I think equiv_group_flag is historical.
@@ -95,6 +97,7 @@ class AreaWGURL(models.Model):
         return u'%s (%s)' % (self.name, self.description)
     class Meta:
         ordering = ['name']
+        verbose_name = "Area/WG URL"
         db_table = "wg_www_pages"
 
 class IDStatus(models.Model):
@@ -307,7 +310,7 @@ class IESGLogin(models.Model):
     last_name = models.CharField(blank=True, max_length=25)
     person = models.ForeignKey(PersonOrOrgInfo, db_column='person_or_org_tag', unique=True)
     pgp_id = models.CharField(blank=True, null=True, max_length=20)
-    default_search = models.IntegerField(null=True)
+    default_search = models.NullBooleanField()
     def __str__(self):
         #return "%s, %s" % ( self.last_name, self.first_name)
         return "%s %s" % ( self.first_name, self.last_name)
@@ -437,8 +440,9 @@ class RfcAuthor(models.Model):
 	verbose_name = 'RFC Author'
 
 class RfcObsolete(models.Model):
+    ACTION_CHOICES=(('Obsoletes', 'Obsoletes'), ('Updates', 'Updates'))
     rfc = models.ForeignKey(Rfc, db_column='rfc_number', related_name='updates_or_obsoletes')
-    action = models.CharField(max_length=20)
+    action = models.CharField(max_length=20, choices=ACTION_CHOICES)
     rfc_acted_on = models.ForeignKey(Rfc, db_column='rfc_acted_on', related_name='updated_or_obsoleted_by')
     def __str__(self):
         return "RFC%04d %s RFC%04d" % (self.rfc_id, self.action, self.rfc_acted_on_id)
@@ -773,6 +777,7 @@ class WGType(models.Model):
     def __str__(self):
 	return self.type
     class Meta:
+        verbose_name = "WG Type"
         db_table = 'g_type'
 
 class WGStatus(models.Model):
@@ -781,6 +786,8 @@ class WGStatus(models.Model):
     def __str__(self):
 	return self.status
     class Meta:
+        verbose_name = "WG Status"
+        verbose_name_plural = "WG Statuses"
         db_table = 'g_status'
 
 class IETFWG(models.Model):

ietf/iesg/models.py

@@ -77,8 +77,9 @@ class TelechatAgendaItem(models.Model):
     TYPE_CHOICES = (
         (1, "Working Group News"),
         (2, "IAB News"),
-        (3, "Management Items")
+        (3, "Management Item")
         )
+    TYPE_CHOICES_DICT = dict(TYPE_CHOICES)
     id = models.AutoField(primary_key=True, db_column='template_id')
     text = models.TextField(blank=True, db_column='template_text')
     type = models.IntegerField(db_column='template_type', choices=TYPE_CHOICES)
@@ -87,6 +88,9 @@ class TelechatAgendaItem(models.Model):
     #note = models.TextField(null=True,blank=True)
     #discussed_status_id = models.IntegerField(null=True, blank=True)
     #decision = models.TextField(null=True,blank=True)
+    def __unicode__(self):
+        type_name = self.TYPE_CHOICES_DICT.get(self.type, str(self.type))
+        return u'%s: %s' % (type_name, self.title)
     class Meta:
         db_table = 'templates'
 

ietf/liaisons/models.py

@@ -23,6 +23,8 @@ class FromBodies(models.Model):
 	return self.body_name
     class Meta:
         db_table = 'from_bodies'
+        verbose_name = "From body"
+        verbose_name_plural = "From bodies"
 
 class LiaisonDetail(models.Model):
     detail_id = models.AutoField(primary_key=True)

ietf/proceedings/models.py

@@ -502,6 +502,8 @@ class WgProceedingsActivities(models.Model, ResolveAcronym):
         return "this is WgProceedingsActivities.__str__"
     class Meta:
         db_table = 'wg_proceedings_activities'
+        verbose_name = "WG Proceedings Activity"
+        verbose_name_plural = "WG Proceedings Activities"
 
 # changes done by convert-096.py:changed maxlength to max_length
 # removed core