From: yomguy <yomguy@parisson.com>
Date: Tue, 1 Feb 2011 10:03:32 +0000 (+0100)
Subject: marker is now a dict
X-Git-Tag: 1.1~469^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7bc4778b865e48bf168227e3c99ffc3bce34985b;p=telemeta.git

marker is now a dict
---

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index cf7c4f83..c2747ee0 100644
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -365,7 +365,7 @@ class MediaItemMarker(ModelCore):
     element_type = 'marker'
     item_id  = CharField(_('item_id'), required=True)
     public_id = CharField(_('public_id'), required=True)
-    time = CharField(_('time'), required=True)
+    time = FloatField(_('time'), required=True)
     description = TextField(_('description'))
     author = CharField(_('author'))
     
diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 25e9e0df..fa7393ea 100644
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -532,16 +532,20 @@ class WebView(object):
         return redirect('telemeta-home')
         
     @jsonrpc_method('telemeta.add_marker')
-    def add_marker(request, item_id, public_id, time, description):
-        # FIXME: get current logged author
-        author = 'test'
-#        item = MediaItem.objects.get(public_id=item_id)
-        marker = MediaItemMarker(item_id=item_id) 
-        marker.public_id = public_id
-        marker.time = time
-        marker.description = description
-        marker.author= author
-        marker.save()
+    def add_marker(request, marker):
+        # marker must be a dict
+        if isinstance(marker, dict):
+            m = MediaItemMarker(item_id=marker['item_id']) 
+            m.public_id = marker['public_id']
+            m.time = float(marker['time'])
+            m.description = marker['description']
+            # FIXME: get current logged author
+            # marker.author = marker['author']
+            author = 'test'
+            m.author = author
+            m.save()
+        else:
+            return 'Error : Bad marker dictionnary'
 
     @jsonrpc_method('telemeta.del_marker')
     def del_marker(request, public_id):
@@ -555,7 +559,7 @@ class WebView(object):
         for marker in markers:
             dict = {}
             dict['public_id'] = marker.public_id
-            dict['time'] = marker.time
+            dict['time'] = str(marker.time)
             dict['description'] = marker.description
             dict['author'] = marker.author
             list.append(dict)