Ajout ouverture de la derniere liste de lecture utilisée

Former-commit-id: 7c93e641e9509f6ea41a8a77634b6105587226e4

diff --git a/telemeta/static/telemeta/js/playlist.js b/telemeta/static/telemeta/js/playlist.js
index b4631372ca8d11131be2baa3a77b8cca903ece5e..66e1eb6f755ad3408d1dbf7669f3a04241ec7859 100644 (file)
--- a/telemeta/static/telemeta/js/playlist.js
+++ b/telemeta/static/telemeta/js/playlist.js
@@ -113,9 +113,9 @@ var playlistUtils = {
         });
     },
 
-    removeResource: function(id, id_playlist){
-        json([id, id_playlist],'telemeta.del_playlist_resource',function(data){
-               var id = JSON.parse(data.result).result;
+    removeResource: function(id, range_playlist){
+        json([id, range_playlist],'telemeta.del_playlist_resource',function(data){
+               var id = data.result;
                window.location.pathname = '/desk/lists/open-list-' + id;
         });
     },

diff --git a/telemeta/templates/telemeta/lists.html b/telemeta/templates/telemeta/lists.html
index 834ac1328022e43197ac8a9ffeccf71f259af527..01a2bffc538a18d4ca13e52e75972bad193dd673 100644 (file)
--- a/telemeta/templates/telemeta/lists.html
+++ b/telemeta/templates/telemeta/lists.html
@@ -7,6 +7,50 @@
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/jquery-ui.css" />
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/lists_sorttable.css" media="print, projection, screen"/>
 {% endblock %}
+
+{% block extra_javascript %}
+<script src="{{ STATIC_URL }}telemeta/js/popupdiv.js" type="text/javascript"></script>
+<script src="{{ STATIC_URL }}telemeta/js/playlist.js" type="text/javascript"></script>
+<script src="{{ STATIC_URL }}tablesorter/jquery.tablesorter.min.js" type="text/javascript"></script>
+<script src="{{ STATIC_URL }}jquery-ui/jquery-ui.min.js" type="text/javascript"></script>
+<script>
+    jQuery(window).ready(function(){
+        var p = playlistUtils;
+        var a = jQuery('#_new_playlist');
+        a.unbind('click').click(function(){p.showAdd(a);});
+        });
+
+    {% for playlist in playlists %}
+        playlistUtils.addEditPlaylist('{{playlist.playlist.public_id}}','{{ playlist.playlist.title }}','{{playlist.playlist.description}}');
+    {% endfor %}
+
+</script>
+
+{% comment "added by Killian Mary" %}{% endcomment %}
+
+<script>
+    $(document).ready(function() {
+        var nouvellesIcones = {
+            header : 'ui-icon-carat-1-e',
+            activeHeader : 'ui-icon-carat-1-s',
+
+        };
+
+        $("#accordeon").accordion({
+            collapsible : true,
+            icons : nouvellesIcones,
+            heightStyle: "content",
+            active: {{ last_playlist }},
+        });
+
+        $.tablesorter.defaults.sortList = [[2,0]];
+        {% for playlist in playlists %}
+            $("#{{playlist.playlist.public_id}}tb").tablesorter({headers: {6:{sorter:false}}} );
+        {% endfor %}
+    });
+</script>
+{% endblock %}
+
 {% comment "added by Killian Mary end" %}{% endcomment %}
 
 {% comment "added by Killian Mary end" %}{% endcomment %}
@@ -45,16 +89,8 @@
 
     <div id="accordeon" style="margin-bottom:20px;">
 
-    {% startinc playlists|length %}
-
     {% for playlist in playlists %}
-    {% if playlist.playlist.public_id != last_playlist %}
-               {% incinc %}
-       {% else %}
-               {% bloqueinc %}
-    {% endif %}
        
-
     <div><a href="#">{{ playlist.playlist.title }}</a></div>
     <div>
         <table class="listing" style="width:100%;margin-top: 1em;">
@@ -124,7 +160,7 @@
                     {% endif %}
                 </td>
                 <td style="vertical-align:middle">
-                <a href="#" onclick="if(confirm(gettrans('delete the resource from the playlist permanently?'))){playlistUtils.removeResource('{{resource.public_id}}', '{{playlist.playlist.public_id}}');};return false;" class="component_icon button icon_cancel" style="padding: 4px 12px;"></a>
+                <a href="#" onclick="if(confirm(gettrans('delete the resource from the playlist permanently?'))){playlistUtils.removeResource('{{resource.public_id}}', '{{ forloop.parentloop.counter0 }}');};return false;" class="component_icon button icon_cancel" style="padding: 4px 12px;"></a>
                 </td>
             </tr>
             {% endfor %}
@@ -135,47 +171,4 @@
     </div>
 </div>
 {% endblock %}
-{% block extra_javascript %}
-<script src="{{ STATIC_URL }}telemeta/js/popupdiv.js" type="text/javascript"></script>
-<script src="{{ STATIC_URL }}telemeta/js/playlist.js" type="text/javascript"></script>
-<script src="{{ STATIC_URL }}tablesorter/jquery.tablesorter.min.js" type="text/javascript"></script>
-<script src="{{ STATIC_URL }}jquery-ui/jquery-ui.min.js" type="text/javascript"></script>
-<script>
-    jQuery(window).ready(function(){
-        var p = playlistUtils;
-        var a = jQuery('#_new_playlist');
-        a.unbind('click').click(function(){p.showAdd(a);});
-        });
-
-    {% for playlist in playlists %}
-        playlistUtils.addEditPlaylist('{{playlist.playlist.public_id}}','{{ playlist.playlist.title }}','{{playlist.playlist.description}}');
-    {% endfor %}
 
-</script>
-
-{% comment "added by Killian Mary" %}{% endcomment %}
-
-<script>
-    $(document).ready(function() {
-        var nouvellesIcones = {
-            header : 'ui-icon-carat-1-e',
-            activeHeader : 'ui-icon-carat-1-s',
-
-        };
-
-        $("#accordeon").accordion({
-            collapsible : true,
-            icons : nouvellesIcones,
-            heightStyle: "content",
-            active: {% valinc %}
-        });
-
-        $.tablesorter.defaults.sortList = [[2,0]];
-        {% for playlist in playlists %}
-            $("#{{playlist.playlist.public_id}}tb").tablesorter({headers: {6:{sorter:false}}} );
-        {% endfor %}
-    });
-</script>
-
-{% endinc %}
-{% endblock %}

diff --git a/telemeta/templatetags/telemeta_tags.py b/telemeta/templatetags/telemeta_tags.py
index c5e19820ba75a93fc98520035b33e0898dfdfffc..a085034424fbe2011158341026c206b5776d792f 100644 (file)
--- a/telemeta/templatetags/telemeta_tags.py
+++ b/telemeta/templatetags/telemeta_tags.py
@@ -467,47 +467,3 @@ def get_googletools():
 @register.assignment_tag
 def settings_value(name):
     return getattr(settings, name, "")
-    
-cpt = None
-    
-class Inc:
-    
-    def __init__(self, limite):
-        self.var = 0
-        self.limite = limite
-        self.bloque = False
-        
-    def inc(self):
-       if self.bloque == False:
-               self.var = self.var +1
-        if self.var == self.limite:
-            self.var = 0
-        
-@register.simple_tag
-def startinc(limite):
-    global cpt
-    cpt = Inc(limite)
-    return ''
-    
-@register.simple_tag
-def incinc():
-    global cpt
-    cpt.inc()
-    return ''
-
-@register.simple_tag
-def valinc():
-    global cpt
-    return cpt.var
-    
-@register.simple_tag
-def bloqueinc():
-    global cpt
-    cpt.bloque = True
-    return ''
-    
-@register.simple_tag
-def endinc():
-       global cpt
-       cpt = None
-       return ''

diff --git a/telemeta/urls.py b/telemeta/urls.py
index 903a31e550f44fd795da392c99f50817758f23df..da87944347c02f46abb78b8dfe148111c8ea1530 100644 (file)
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -190,7 +190,7 @@ urlpatterns = patterns('',
     url(r'^accounts/$', home_view.users, name="telemeta-users"),
 
     # Desk
-    url(r'^desk/lists/(?:open-list-(?P<id_playlist>[0-9]+)/)?$', home_view.lists, name="telemeta-desk-lists"),
+    url(r'^desk/lists/(?:open-list-(?P<range_playlist>[0-9]+)/)?$', home_view.lists, name="telemeta-desk-lists"),
     url(r'^desk/profile/(?P<username>[A-Za-z0-9@+._-]+)/$', profile_view.profile_detail, name="telemeta-desk-profile"),
     url(r'^desk/home/$', home_view.home, name="telemeta-desk-home"),
 

diff --git a/telemeta/views/home.py b/telemeta/views/home.py
index b784b3eebf641d78b2b10fe2b439313694fde4fb..ba77fc97695ad00694a97cbf028665c01762fd36 100644 (file)
--- a/telemeta/views/home.py
+++ b/telemeta/views/home.py
@@ -62,7 +62,7 @@ class HomeView(object):
                     'sound_pub_item': sound_pub_item })
         return HttpResponse(template.render(context))
 
-    def lists(self, request, id_playlist):
+    def lists(self, request, range_playlist):
         """Render the home page"""
 
         if request.user.is_authenticated():
@@ -70,9 +70,10 @@ class HomeView(object):
             playlists = get_playlists(request)
             revisions = get_revisions(100)
             user_revisions = get_revisions(25, request.user)
-            last_playlist = id_playlist
+            if range_playlist is None:
+                range_playlist = 0
             return render(request, template, {'playlists': playlists,
-                                              'revisions': revisions, 'user_revisions': user_revisions , 'last_playlist':last_playlist})
+                                              'revisions': revisions, 'user_revisions': user_revisions , 'last_playlist':range_playlist})
         else:
             template = 'telemeta/messages.html'
             mess = ugettext('Access not allowed')

diff --git a/telemeta/views/playlist.py b/telemeta/views/playlist.py
index 9991e53f636824b4d124ccc31a6b1970f54126f7..9138a7214b87bcf324c4879b8cf28ded7937780a 100644 (file)
--- a/telemeta/views/playlist.py
+++ b/telemeta/views/playlist.py
@@ -69,11 +69,10 @@ class PlaylistView(object):
             raise 'Error : Bad playlist_resource dictionnary'
 
     @jsonrpc_method('telemeta.del_playlist_resource')
-    def del_playlist_resource(request, public_id, playlist_id):
+    def del_playlist_resource(request, public_id, playlist_range):
         m = PlaylistResource.objects.get(public_id=public_id)
         m.delete()
-        reponse = {'result': playlist_id, "error":None, "id":"jsonrpc"}
-        return json.dumps(reponse)
+        return playlist_range
 
     def get_elements(self, playlist, resource_type):
         resources = PlaylistResource.objects.filter(playlist=playlist)