From: yomguy <yomguy@parisson.com>
Date: Wed, 11 May 2011 11:45:37 +0000 (+0200)
Subject: change marker management : item_id is now item.id
X-Git-Tag: 1.1~213
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=65d7eed0ab81ce450844be8763cb7c859e644c99;p=telemeta.git

change marker management : item_id is now item.id
---

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 3931ac25..ae27cbff 100644
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -874,7 +874,7 @@ class WebView(object):
         # marker must be a dict
         if isinstance(marker, dict):
             item_id = marker['item_id']
-            item = MediaItem.objects.get(code=item_id)
+            item = MediaItem.objects.get(id=item_id)
             m = MediaItemMarker(item=item) 
             m.public_id = marker['public_id']
             m.time = float(marker['time'])
@@ -887,14 +887,14 @@ class WebView(object):
             raise 'Error : Bad marker dictionnary'
 
     @jsonrpc_method('telemeta.del_marker')
-    def del_marker(request, public_id):
-        m = MediaItemMarker.objects.get(public_id=public_id)
+    def del_marker(request, item_id):
+        m = MediaItemMarker.objects.get(id=item_id)
         m.delete()
         
     @jsonrpc_method('telemeta.get_markers')
     def get_markers(request, item_id):
-        item = MediaItem.objects.get(public_id=item_id)
-        markers = MediaItemMarker.objects.filter(item=item.pk)
+        item = MediaItem.objects.get(id=item_id)
+        markers = MediaItemMarker.objects.filter(item=item)
         list = []
         for marker in markers:
             dict = {}