Adjusted ordering for a number of meeting-related models to make the most relevant entries appear first in lists and drop-downs. Fixes issue #2457.

- Legacy-Id: 14694

ietf/meeting/admin.py

@@ -17,7 +17,6 @@ class RoomAdmin(admin.ModelAdmin):
     list_display = ["id", "meeting", "name", "capacity", "functional_name", "x1", "y1", "x2", "y2", ]
     list_filter = ["meeting"]
     inlines = [UrlResourceInline, ]
-    ordering = ["-meeting"]
 
 admin.site.register(Room, RoomAdmin)
 
@@ -28,7 +27,6 @@ class MeetingAdmin(admin.ModelAdmin):
     list_display = ["number", "type", "date", "location", "time_zone"]
     list_filter = ["type"]
     search_fields = ["number"]
-    ordering = ["-date"]
     inlines = [RoomInline]
 
     def location(self, instance):
@@ -94,7 +92,7 @@ class ScheduleAdmin(admin.ModelAdmin):
     list_filter = ["meeting", ]
     raw_id_fields = ["meeting", "owner", ]
     search_fields = ["meeting__number", "name", "owner__name"]
-    ordering = ["meeting", "name"]
+    ordering = ["-meeting", "name"]
 
 admin.site.register(Schedule, ScheduleAdmin)
 
@@ -129,6 +127,6 @@ admin.site.register(SessionPresentation, SessionPresentationAdmin)
 class ImportantDateAdmin(admin.ModelAdmin):
     model = ImportantDate
     list_display = ['meeting', 'name', 'date']
-    ordering = ['-meeting__number','date',]
+
 
 admin.site.register(ImportantDate,ImportantDateAdmin)

ietf/meeting/models.py

@@ -279,7 +279,7 @@ class Meeting(models.Model):
         return self._previous_meeting_cache
 
     class Meta:
-        ordering = ["-date", "id"]
+        ordering = ["-date", "-id"]
 
 # === Rooms, Resources, Floorplans =============================================
 
@@ -375,7 +375,7 @@ class Room(models.Model):
         return urlresource.url if urlresource else None
     #
     class Meta:
-        ordering = ["-meeting", "name"]
+        ordering = ["-id"]
 
 
 class UrlResource(models.Model):
@@ -396,6 +396,9 @@ class FloorPlan(models.Model):
     order   = models.SmallIntegerField()
     image   = models.ImageField(storage=NoLocationMigrationFileSystemStorage(), upload_to=floorplan_path, blank=True, default=None)
     #
+    class Meta:
+        ordering = ['-id',]
+    #
     def __unicode__(self):
         return 'floorplan-%s-%s' % (self.meeting.number, xslugify(self.name))
 
@@ -563,7 +566,7 @@ class TimeSlot(models.Model):
             time__lt = self.time + self.duration + datetime.timedelta(seconds=11*60)).first()
 
     class Meta:
-        ordering = ["-time", "id"]
+        ordering = ["-time", "-id"]
 
 
 # end of TimeSlot
@@ -1115,4 +1118,4 @@ class ImportantDate(models.Model):
     date = models.DateField()
     name = models.ForeignKey(ImportantDateName)
     class Meta:
-        ordering = ["-meeting","date", ]
+        ordering = ["-meeting_id","date", ]