change Marker model to add author, title and date

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index d10468607fbcee5692ce67bdd78f84a9291db5a2..35648ae343f307adfe06903b3b7d58abe98e8af4 100644 (file)
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -375,11 +375,14 @@ class MediaItemMarker(ModelCore):
     "2D marker object : text value vs. time"
     
     element_type = 'marker'
-    item  = ForeignKey('MediaItem', related_name="markers", verbose_name=_('item'))
-    public_id = CharField(_('public_id'), required=True)
-    time = FloatField(_('time'), required=True)
-    description = TextField(_('description'))
-    author = CharField(_('author'))
+    
+    item            = ForeignKey('MediaItem', related_name="markers", verbose_name=_('item'))
+    public_id       = CharField(_('public_id'), required=True)
+    time            = FloatField(_('time'), required=True)
+    title           = CharField(_('title'))
+    date            = DateField(_('date'), auto_now=True)
+    description     = TextField(_('description'))
+    author          = ForeignKey(User, db_column='author', related_name="markers", verbose_name=_('author'))
     
     class Meta(MetaCore):
         db_table = 'media_markers'

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 61f89ae2c4ca35090a4c4d081ebf8a81de8d048f..2d2482028926e5514e8790fb02d082f651beb01d 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -53,6 +53,7 @@ from django.contrib import auth
 from django.contrib.auth.decorators import login_required, permission_required
 from django.core.context_processors import csrf
 from django.forms.models import modelformset_factory
+from django.contrib.auth.models import User
 
 from telemeta.models import MediaItem, Location, MediaCollection, EthnicGroup, MediaCollectionForm, MediaItemForm
 from telemeta.models import dublincore, Enumeration, MediaItemMarker,  Instrument
@@ -699,10 +700,9 @@ class WebView(object):
             m = MediaItemMarker(item=item) 
             m.public_id = marker['public_id']
             m.time = float(marker['time'])
+            m.title = marker['title']
             m.description = marker['description']
-            # FIXME: get current logged author
-            # marker.author = marker['author']
-            author = 'test'
+            author = User.objects.get(username=marker['author'])
             m.author = author
             m.save()
         else:
@@ -722,8 +722,9 @@ class WebView(object):
             dict = {}
             dict['public_id'] = marker.public_id
             dict['time'] = str(marker.time)
+            dict['title'] = marker.title
             dict['description'] = marker.description
-            dict['author'] = marker.author
+            dict['author'] = marker.author.username
             list.append(dict)
         return list
 
@@ -732,6 +733,7 @@ class WebView(object):
         if isinstance(marker, dict):
             m = MediaItemMarker.objects.get(public_id=marker['public_id'])
             m.time = float(marker['time'])
+            m.title = marker['title']
             m.description = marker['description']
             m.save()
         else: