diff -r f71bdd7b11f4 -r 90fd14c649bb web/ldt/ldt_utils/models.py --- a/web/ldt/ldt_utils/models.py Tue Sep 21 09:38:45 2010 +0200 +++ b/web/ldt/ldt_utils/models.py Tue Sep 21 13:06:17 2010 +0200 @@ -47,13 +47,10 @@ class Content(models.Model): iri_id = models.CharField(max_length=1024, unique=True, default=generate_uuid, verbose_name=_('content.iri_id')) iriurl = models.CharField(max_length=1024, verbose_name=_('content.iriurl')) -# src = models.CharField(max_length=1024, null=True, blank=True, verbose_name=_('content.src')) -# videopath = models.CharField(max_length=1024, null=True, blank=True, verbose_name=_('content.videopath')) creation_date = models.DateTimeField(auto_now_add=True, verbose_name=_('content.creation_date')) update_date = models.DateTimeField(auto_now=True, verbose_name=_('content.update_date')) title = models.CharField(max_length=1024, null=True, blank=True, verbose_name=_('content.title')) description = models.TextField(null=True, blank=True, verbose_name=_('content.description')) -# external_id = models.CharField(max_length=1024, null=True, blank=True, verbose_name=_('content.external_id')) authors = models.ManyToManyField(Author, blank=True, verbose_name=_('content.authors')) duration = models.IntegerField(null=True, blank=True, verbose_name=_('content.duration')) content_creation_date = models.DateTimeField(null=True, blank=True, verbose_name=_('content.content_creation_date')) @@ -169,26 +166,26 @@ src = property(**src()) - def externalid(): #@NoSelf + def external_id(): #@NoSelf doc = """simulate externalid""" #@UnusedVariable def fget(self): if self.media_obj is None: empty_media = self.__get_empty_media() if empty_media: - return empty_media.externalid + return empty_media.external_id else: return None else: - return self.media_obj.externalid + return self.media_obj.external_id def fset(self, value): if self.media_obj is not None: - self.media_obj.externalid = value + self.media_obj.external_id = value return locals() - externalid = property(**externalid()) + external_id = property(**external_id())