From bc1bd60caf3a3cca215d77b8fab5416feafe236f Mon Sep 17 00:00:00 2001 From: yomguy Date: Wed, 11 May 2011 13:02:57 +0200 Subject: [PATCH] id and not pk for resource_id --- telemeta/web/base.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/telemeta/web/base.py b/telemeta/web/base.py index db9e568f..c9159f40 100644 --- a/telemeta/web/base.py +++ b/telemeta/web/base.py @@ -949,11 +949,11 @@ class WebView(object): for resource in playlist_resources: try: if resource.resource_type == 'item': - element = MediaItem.objects.get(pk=resource.resource_id) + element = MediaItem.objects.get(id=resource.resource_id) if resource.resource_type == 'collection': - element = MediaCollection.objects.get(pk=resource.resource_id) + element = MediaCollection.objects.get(id=resource.resource_id) if resource.resource_type == 'marker': - element = MediaItemMarker.objects.get(pk=resource.resource_id) + element = MediaItemMarker.objects.get(id=resource.resource_id) except: element = None resources.append({'element': element, 'type': resource.resource_type, 'public_id': resource.public_id }) @@ -1000,17 +1000,17 @@ class WebView(object): for resource in resources: if resource_type == 'items': if resource.resource_type == 'collection': - collection = MediaCollection.objects.get(pk=resource.resource_id) + collection = MediaCollection.objects.get(id=resource.resource_id) collection_items = MediaItem.objects.filter(collection=collection) for item in collection_items: elements.append(item) elif resource.resource_type == 'item': - item = MediaItem.objects.get(pk=resource.resource_id) + item = MediaItem.objects.get(id=resource.resource_id) elements.append(item) elif resource_type == 'collections': if resource.resource_type == 'collection': - collection = MediaCollection.objects.get(pk=resource.resource_id) + collection = MediaCollection.objects.get(id=resource.resource_id) elements.append(collection) if elements: -- 2.39.5