remove is_current property for Playlist

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index b5981921d230027d10193d9e9a744df8cb4ca32c..f59e5a1be194c4c3daf65358caeb2d6319b969b4 100644 (file)
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -351,7 +351,6 @@ class Playlist(ModelCore):
     author         = ForeignKey(User, related_name="playlists", db_column="author")
     title          = CharField(_('title'), required=True)
     description    = TextField(_('description'))
-    is_current     = BooleanField(_('current_user_playlist'))
 
     class Meta(MetaCore):
         db_table = 'playlists'

diff --git a/telemeta/templates/telemeta_default/home.html b/telemeta/templates/telemeta_default/home.html
index e24e0524f895965b4f091d0edd7c7a077a986c19..85921191c975ac120e3e86759345d1b34f2858a5 100644 (file)
--- a/telemeta/templates/telemeta_default/home.html
+++ b/telemeta/templates/telemeta_default/home.html
@@ -50,11 +50,8 @@
 <h3>{% trans "Playlists" %} {% trans "Add" %}</h3>
   {% for playlist in playlists %}
   <div>
-  <h2>{{ playlist.playlist.title }} {% if playlist.playlist.is_current %}(current){% endif %} 
+  <h2>{{ playlist.playlist.title }} 
   <a href="{% url telemeta-playlist-csv-export playlist.playlist.public_id %}">CSV</a>
-  {% if not playlist.playlist.is_current %}
-    {% trans "Make_Current" %} 
-  {% endif %}
   {% trans "Delete" %}
   
   </h2>

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index d4f684d3bf2a73693cc5b507d20825c84f8559be..f37d30baf31a4d286e81b91554eb2eec2c9b331f 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -785,7 +785,6 @@ class WebView(object):
             m.title = playlist['title']
             m.description = playlist['description']
             m.author = request.user
-            m.is_current = False
             m.save()
         else:
             raise 'Error : Bad playlist dictionnary'
@@ -794,17 +793,6 @@ class WebView(object):
     def del_playlist(request, public_id):
         m = Playlist.objects.get(public_id=public_id)
         m.delete()
-    
-    @jsonrpc_method('telemeta.make_playlist_current')
-    def make_playlist_current(request, public_id):
-        playlists = Playlist.objects.filter(author=request.user)
-        for playlist in playlists:
-            if playlist.is_current:
-                playlist.is_current = False
-                playlist.save()
-        m = Playlist.objects.get(public_id=public_id)
-        m.is_current = True
-        m.save()
         
     def get_playlists(self, request):
         user_playlists = Playlist.objects.filter(author=request.user)
@@ -834,12 +822,12 @@ class WebView(object):
             raise 'Error : Bad playlist dictionnary'
  
     @jsonrpc_method('telemeta.add_playlist_resource')
-    def add_playlist_resource(request, playlist_resource):
+    def add_playlist_resource(request, playlist_id, playlist_resource):
         # playlist_resource must be a dict
         if isinstance(playlist_resource, dict):
             m = PlaylistResource()
             m.public_id = playlist_resource['public_id']
-            m.playlist = Playlist.objects.get(is_current=True, author=request.user)
+            m.playlist = Playlist.objects.get(public_id=playlist_id, author=request.user)
             m.resource_type = playlist_resource['resource_type']
             m.resource_id = playlist_resource['resource_id']
             m.save()