[Debconf-video-commits] r362 - package/branches/pycon09/src/debconfvideo/web/pyconvideo

[benh at alioth.debian.org]

Author: benh
Date: 2009-03-21 17:32:41 +0000 (Sat, 21 Mar 2009)
New Revision: 362

Modified:
   package/branches/pycon09/src/debconfvideo/web/pyconvideo/models.py
Log:
Improve displayed names of fields.


Modified: package/branches/pycon09/src/debconfvideo/web/pyconvideo/models.py
===================================================================
--- package/branches/pycon09/src/debconfvideo/web/pyconvideo/models.py	2009-03-21 17:23:53 UTC (rev 361)
+++ package/branches/pycon09/src/debconfvideo/web/pyconvideo/models.py	2009-03-21 17:32:41 UTC (rev 362)
@@ -36,7 +36,8 @@
 class ConferenceRoom(models.Model):
     conference = models.ForeignKey(Conference)
     # Not really the primary key, but this will only be used for one conference
-    conference_room = models.CharField(primary_key=True, max_length=100)
+    conference_room = models.CharField(primary_key=True, max_length=100,
+                                       verbose_name='name')
     def __unicode__(self):
         return self.conference_room
     class Meta:
@@ -46,7 +47,9 @@
     event_id = models.AutoField(primary_key=True)
     source_url = models.CharField(unique=True, max_length=200)
     conference_id = models.IntegerField()
-    conference_room = models.ForeignKey(ConferenceRoom, db_column='conference_room')
+    conference_room = models.ForeignKey(ConferenceRoom,
+                                        db_column='conference_room',
+                                        verbose_name='room')
     title = models.CharField(max_length=200)
     description = models.CharField(max_length=4000)
     start_time = models.DateTimeField()
@@ -58,8 +61,10 @@
 
 class VideoFileStatus(models.Model):
     id = models.AutoField(primary_key=True)
-    file_status_code = models.CharField(unique=True, max_length=1)
-    file_status_desc = models.CharField(max_length=1000)
+    file_status_code = models.CharField(unique=True, max_length=1,
+                                        verbose_name='code')
+    file_status_desc = models.CharField(max_length=1000,
+                                        verbose_name='description')
     def __unicode__(self):
         return u'%s: %s' % (self.file_status_code, self.file_status_desc)
     class Meta:
@@ -69,10 +74,13 @@
 class VideoRecording(models.Model):
     id = models.AutoField(primary_key=True)
     conference_id = models.IntegerField()
-    conference_room = models.ForeignKey(ConferenceRoom, db_column='conference_room')
-    recording_time = models.DateTimeField()
-    recording_duration = IntervalField()
-    recording_filename = models.CharField(unique=True, max_length=100)
+    conference_room = models.ForeignKey(ConferenceRoom,
+                                        db_column='conference_room',
+                                        verbose_name='room')
+    recording_time = models.DateTimeField(verbose_name='start time')
+    recording_duration = IntervalField(verbose_name='duration')
+    recording_filename = models.CharField(unique=True, max_length=100,
+                                          verbose_name='filename')
     file_status = models.ForeignKey(VideoFileStatus)
     comments = models.TextField()
     locked_by = models.ForeignKey(auth.models.User, db_column='locked_by', null=True)
@@ -87,7 +95,9 @@
     recording = models.ForeignKey(VideoRecording)
     start_time = IntervalField()
     end_time = IntervalField()
-    event_recording_base_name = models.CharField(max_length=150)
+    event_recording_base_name = \
+        models.CharField(max_length=150,
+                         verbose_name='base name for target files')
     def __unicode__(self):
         return u'"%s" in "%s"' % (self.event, self.recording)
     class Meta:
@@ -107,7 +117,7 @@
     audio_channel_count = models.IntegerField()
     audio_codec_name = models.CharField(max_length=20)
     audio_bit_rate = models.IntegerField()
-    published = models.BooleanField()
+    published = models.BooleanField(verbose_name='publish files')
     def __unicode__(self):
         return self.target_format_abbr
     class Meta: