fix playlists for markers

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index 6b47d57784f7a6bbfb5cb17ba0a712367309549d..45f1787a800b660a13e72d246806e49186fd6c71 100644 (file)
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -365,12 +365,12 @@ class PlaylistForm(ModelForm):
 
 class PlaylistResource(ModelCore):
     "Playlist components"
-    RESOURCE_TYPE_CHOICES = (('item', 'item'), ('collection', 'collection'))
+    RESOURCE_TYPE_CHOICES = (('item', 'item'), ('collection', 'collection'), ('marker', 'marker'))
     element_type = 'playlist_resource'
     public_id          = CharField(_('public_id'), required=True)
     playlist           = ForeignKey('Playlist', related_name="resources", verbose_name=_('playlist'))
-    resource_type      = CharField(_('resource type'), choices=RESOURCE_TYPE_CHOICES, required=True)
-    resource_id        = CharField(_('resource'), required=True)
+    resource_type      = CharField(_('resource_type'), choices=RESOURCE_TYPE_CHOICES, required=True)
+    resource_id        = CharField(_('resource_id'), required=True)
 
     class Meta(MetaCore):
         db_table = 'playlist_resources'
@@ -395,7 +395,7 @@ class MediaItemMarker(MediaResource):
         db_table = 'media_markers'
 
     def __unicode__(self):
-        return self.time + ' : ' + self.description + '(' + self.author + ')'
+        return self.title
 
 class Search(ModelCore):
     "Keywork search"

diff --git a/telemeta/templates/telemeta_default/home.html b/telemeta/templates/telemeta_default/home.html
index ed51f2afb889d0b2bd6f1e1c7903d2b694a11029..0f175eaef084fb2c9c2dbccff5a1c3a0f99d6dbe 100644 (file)
--- a/telemeta/templates/telemeta_default/home.html
+++ b/telemeta/templates/telemeta_default/home.html
@@ -23,14 +23,20 @@
         
         {% for resource in playlist.resources %}
         <tr>
+            <td>
             {% if resource.type == "item" %}
-            <td><a href="{% url telemeta-item-detail resource.element.public_id %}">{{ resource.element }}</td>
-            {% else %}
-            <td><a href="{% url telemeta-collection-detail resource.element.public_id %}">{{ resource.element }}</td>
+            <a href="{% url telemeta-item-detail resource.element.public_id %}">{{ resource.element }}</a>
+            {% endif %}
+            {% if resource.type == "collection" %}
+            <a href="{% url telemeta-collection-detail resource.element.public_id %}">{{ resource.element }}</a>
             {% endif %}
+            {% if resource.type == "marker" %}
+            {{ resource.element }}
+            {% endif %}
+            </td>
             <td>{{ resource.type }}</td>
             <td>
-                {{ resource.element.code|default:resource.element.old_code }}
+                {{ resource.element.public_id }}
             </td>
             <td>{{ resource.element.apparent_collector }}</td>
            

diff --git a/telemeta/urls.py b/telemeta/urls.py
index f2109633ed242c630a82d05d78a73f6b86844398..fe02de71c5c8362688dd02f08f21b38d45046246 100644 (file)
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -64,8 +64,6 @@ urlpatterns = patterns('',
         name="telemeta-items"),
     url(r'^items/(?P<public_id>[A-Za-z0-9._-]+)/$', web_view.item_detail, 
         name="telemeta-item-detail"),
-    url(r'^items/(?P<public_id>[A-Za-z0-9._-]+)/marker/(?P<marker_id>[A-Za-z0-9]+)/$', web_view.item_detail, 
-        name="telemeta-item-detail"),
     url(r'^items/(?P<public_id>[A-Za-z0-9._-]+)/dc/$', web_view.item_detail, 
         {'template': 'telemeta/mediaitem_detail_dc.html'},
         name="telemeta-item-dublincore"),
@@ -92,6 +90,8 @@ urlpatterns = patterns('',
         dict(template='telemeta/mediaitem_copy.html'), name="telemeta-item-copy"),
     url(r'^item/add/$', web_view.item_add,
         dict(template='telemeta/mediaitem_add.html'), name="telemeta-item-add"),
+    url(r'^items/(?P<public_id>[A-Za-z0-9._-]+)/marker/(?P<marker_id>[A-Za-z0-9]+)/$', web_view.item_detail, 
+        name="telemeta-item-detail-marker"),
 
     # collections
     url(r'^collections/$', 'django.views.generic.list_detail.object_list',

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index fd19d9ba077bed567174025ace3983c1ba701b22..d151e82e95c293cfcef0a34f796b2ec71e22fb28 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -785,6 +785,10 @@ class WebView(object):
             m.name = playlist['name']
             m.description = playlist['description']
             m.author = request.user
+            if playlist['is_current'] == 'True':
+                m.is_current = True
+            else:
+                m.is_current = False
             m.save()
         else:
             raise 'Error : Bad playlist dictionnary'
@@ -802,11 +806,14 @@ class WebView(object):
             resources = []
             for resource in playlist_resources:
                 if resource.resource_type == 'item':
-                    element = MediaItem.objects.get(public_id=resource.resource_id)
+                    element = MediaItem.objects.get(pk=resource.resource_id)
                 if resource.resource_type == 'collection':
-                    element = MediaCollection.objects.get(public_id=resource.resource_id)
+                    element = MediaCollection.objects.get(pk=resource.resource_id)
+                if resource.resource_type == 'marker':
+                    element = MediaItemMarker.objects.get(pk=resource.resource_id)
                 resources.append({'element': element, 'type': resource.resource_type})
-            playlists.append({'name': playlist.name, 'resources': resources})
+            playlists.append({'name': playlist.name, 'description': playlist.description, 
+                            'is_current': playlist.is_current, 'resources': resources})
         return playlists
         
     @jsonrpc_method('telemeta.update_playlist')